Mercurial > kallithea
changeset 7867:4e54b61f52e9 default-i18n
i18n: regenerate translation data (commit de1342abcf42)
Regenerate translation data based on new development on the default branch,
including removal of the repository locking feature, and addition of SSH
repository access.
This commit was created via:
scripts/i18n-update export <repo> -r de1342abcf42
line wrap: on
line diff
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,12 +1,11 @@ # Copyright (C) 2016 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2017-08-20 10:44+0000\n" "Last-Translator: Viktar Vauchkevich <victorenator@gmail.com>\n" "Language-Team: Belarusian <https://hosted.weblate.org/projects/kallithea/" @@ -20,14 +19,14 @@ "X-Generator: Weblate 2.17-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Яшчэ не было змен" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -36,92 +35,92 @@ msgid "None" msgstr "Нічога" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(зачынена)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Паказваць прабелы" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ігнараваць прабелы" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Павялічыць кантэкст да %(num)s радкоў" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permission to change pull request status" msgid "No permission to change status" msgstr "Няма правоў змяняць статус pull-запыту" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "Pull-запыт %s паспяхова выдалены" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "Няма такой рэвізіі ў гэтым рэпазітары" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "Не атрымалася знайсці іншы рэпазітар %s" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "Немагчыма параўноўваць рэпазітары розных тыпаў" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "Немагчыма параўноўваць рэпазітары без агульнага продка" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Няма адказу" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Невядомая памылка" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "Запыт не распазнаны серверам з-за няправільнага сінтаксісу." -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Несанкцыянаваны доступ да рэсурсу" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "У вас няма правоў для прагляду гэтай старонкі" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Рэсурс не знойдзены" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -129,12 +128,12 @@ "Сервер не можа выканаць запыт з-за нечаканых умоваў, якія ўзніклі падчас " "яго спрацавання." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s выканаў каміт у %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -144,124 +143,118 @@ msgid "Changeset was too big and was cut off..." msgstr "Змены апынуліся занадта вялікімі і былі скарочаныя..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "Стужка навін %s %s" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Змены ў рэпазітары %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Націсніце каб дадаць новы файл" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Няма файлаў. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Рэпазітар заблакаваў %s у %s" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "Вы можаце выдаляць файлы толькі ў рэвізіі, злучанай з існай галінай" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s выдалены з дапамогай Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s выдалены" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Падчас каміта адбылася памылка" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" "Вы можаце рэдагаваць файлы толькі ў рэвізіі, злучанай з існай галінай" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s адрэдагаваны з дапамогай Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Без змен" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Змены захаваныя ў %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Файл дададзены з дапамогай Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Пуста" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Безназоўны" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Размяшчэнне павінна быць адносным шляхам, і не можа ўтрымліваць \"..\" у " "шляхі" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Магчымасць спампоўваць адключаная" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Невядомая рэвізія %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Пусты рэпазітар" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Невядомы тып архіва" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Набор змен" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Галіны" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Тэгі" @@ -270,11 +263,11 @@ msgid "An error occurred during repository forking %s" msgstr "Памылка падчас стварэння форка рэпазітара %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Групы" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -282,187 +275,187 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Рэпазітары" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Галіна" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Зачыненыя галіны" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Тэгі" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Закладкі" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Публічны журнал" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Няслушная капча" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Рэгістрацыя ў %s прайшла паспяхова" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "Код для скідання пароля адпраўлены" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Няслушны код скідання пароля" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Пароль абноўлены" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Няслушны рэцэнзент \"%s\"" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (зачынена)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Змены" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Адмысловы" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Галіны ўдзельніка" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Закладкі" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Памылка пры стварэнні pull-запыту: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Адбылася памылка пры стварэнні pull-запыту" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Pull-запыт створаны паспяхова" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Абнаўленне для pull-запыту створана" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Няма апісання" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Pull-запыт абноўлены" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Pull-запыт паспяхова выдалены" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, 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:508 +#: kallithea/controllers/pullrequests.py:506 #, 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:522 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Гэты pull-запыт ужо прыняты на галіну %s." -#: kallithea/controllers/pullrequests.py:524 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Гэты pull-запыт быў зачынены і не можа быць абноўлены." -#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:541 #, 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:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, 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:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Увага: Галіна %s мае яшчэ адну верхавіну: %s." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 #, 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:566 +#: kallithea/controllers/pullrequests.py:564 #, 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:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -478,21 +471,21 @@ msgid "An error occurred during search operation." msgstr "Памылка пры выкананні гэтага пошуку." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Няма дадзеных" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Статыстычныя дадзеныя адключаны для гэтага рэпазітара" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Налады аўтарызацыі паспяхова абноўлены" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "памылка пры абнаўленні налад аўтарызацыі" @@ -504,125 +497,139 @@ msgid "Error occurred during update of defaults" msgstr "Памылка пры абнаўленні стандартных налад" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "Назаўжды" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 хвілін" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 гадзіна" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 дзень" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 месяц" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Адбылася памылка падчас стварэння gist-запіса" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Gist-запіс %s выдалены" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Без змен" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Gist-запіс абноўлены" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "Gist-запіс абноўлены" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "Gist-запіс абноўлены" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "Памылка пры абнаўленні gist-запісу %s" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можаце змяніць дадзеныя гэтага карыстальніка, паколькі ён важны для " "працы ўсёй праграмы" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Ваш уліковы запіс паспяхова абноўлены" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Памылка пры абнаўленні карыстальніка %s" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Памылка пры абнаўленні пароля" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "Карыстальніку дададзены e-mail %s" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "Памылка пры захаванні e-mail" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "E-mail карыстальніка выдалены" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API-ключ паспяхова створаны" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-ключ паспяхова скінуты" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-ключ паспяхова выдалены" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "API-ключ паспяхова створаны" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "API-ключ паспяхова выдалены" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -630,9 +637,9 @@ msgid "Read" msgstr "Чытанне" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -640,9 +647,9 @@ msgid "Write" msgstr "Запіс" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -665,254 +672,239 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Адміністратар" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Адключана" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Дазволена, з ручной актывацыяй уліковага запісу" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Дазволена, з аўтаматычнай актывацыяй уліковага запісу" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Ручная актывацыя вонкавага ўліковага запісу" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Уключана" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "Глабальныя прывілеі паспяхова абноўленыя" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Адбылася памылка падчас абнаўлення прывілеяў" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Адбылася памылка пры стварэнні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Створаная новая група рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Група рэпазітароў %s абноўленая" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Адбылася памылка пры абнаўленні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Група ўтрымлівае %s рэпазітароў і не можа быць выдаленая" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Група ўтрымлівае ў сабе %s падгруп і не можа быць выдаленая" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Група рэпазітароў %s выдаленая" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Памылка пры выдаленні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "Адміністратар не можа адклікаць свае прывелеі" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Прывілеі групы рэпазітароў абноўленыя" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "Памылка пры водгуку прывелея" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Памылка пры стварэнні рэпазітара %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Рэпазітар %s створаны з %s" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Зроблены форк рэпазітара %s на %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Рэпазітар %s створаны" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Рэпазітар %s паспяхова абноўлены" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "Памылка падчас абнаўлення рэпазітара %s" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "Форкі %s адлучаныя" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "Выдаленыя форки рэпазітара %s" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Рэпазітар %s выдалены" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Немагчыма выдаліць %s, ён усё яшчэ мае форкі" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "Памылка падчас выдалення %s" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Прывілеі рэпазітара абноўленыя" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Памылка пры выдаленні поля" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Не форк --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Бачнасць рэпазітара ў публічным часопісе абноўлена" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "Памылка пры даданні рэпазітара ў агульнадаступны часопіс" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Нічога" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Рэпазітар %s адзначаны як форк %s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Памылка пры выкананні аперацыі" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Рэпазітар заблакаваны" - -#: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Рэпазітар разблакаваны" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Памылка падчас разблакавання" - -#: kallithea/controllers/admin/repos.py:528 +#: kallithea/controllers/admin/repos.py:490 msgid "Cache invalidation successful" msgstr "Кэш скінуты" -#: kallithea/controllers/admin/repos.py:532 +#: kallithea/controllers/admin/repos.py:494 msgid "An error occurred during cache invalidation" msgstr "Памылка пры скіданні кэша" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "Занесеныя змены з аддаленага рэпазітара" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "Памылка пры занясенні змен з аддаленага рэпазітара" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "Адбылася памылка пры выдаленні статыстыкі рэпазітара" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "Абноўлены налады VCS" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -920,110 +912,110 @@ "Немагчыма ўключыць падтрымку hgsubversion. Бібліятэка hgsubversion " "адсутнічае" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "Памылка пры абнаўленні наладаў праграмы" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Рэпазітары паспяхова перасканаваныя, дададзена: %s, выдалена: %s." -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "Скінуць кэш для %s рэпазітароў" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "Абноўленыя налады праграмы" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Налады візуалізацыі абноўленыя" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Адбылася памылка пры абнаўленні наладаў візуалізацыі" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Калі ласка, увядзіце e-mail-адрас" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Задача адпраўкі e-mail створаная" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Няма дадзеных" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Дададзены новы хук" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Абноўленыя хукі" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Памылка пры стварэнні хука" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Запланаванае пераіндэксаванне базы Whoosh" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Створана група карыстальнікаў %s" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Памылка пры стварэнні групы карыстальнікаў %s" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Група карыстальнікаў %s абноўленая" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "Памылка пры абнаўленні групы карыстальнікаў %s" -#: kallithea/controllers/admin/user_groups.py:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "Група карыстальнікаў паспяхова выдаленая" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 msgid "An error occurred during deletion of user group" msgstr "Памылка пры выдаленні групы карыстальнікаў" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "Мэтавая група не можа быць той жа самай" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "Прывілеі групы карыстальнікаў абноўленыя" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "Абноўленыя прывілеі" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "Памылка пры захаванні прывілеяў" @@ -1053,221 +1045,223 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Дададзены IP %s у белы спіс карыстальніка" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "Адбылася памылка пры захаванні IP" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "Выдалены IP %s з белага спісу карыстальніка" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" "Вы павінны быць зарэгістраваным карыстальнікам, каб выканаць гэта дзеянне" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "Старонка даступная толькі аўтарызаваным карыстальнікам" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "Няслушны API-ключ" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "Рэпазітар не знойдзены на файлавай сістэме" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "Набор змен для %s %s не знойдзены ў %s" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "Ваш акаўнт выключаны" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Двайковы файл" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Набор змены апынуўся занадта вялікімі і быў падрэзаны, выкарыстоўвайце " "меню параўнання для паказу выніку параўнання" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "Змен не выяўлена" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "Выдаленая галіна: %s" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "Створаны тэг: %s" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "Набор змен %s не знойдзены" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Паказаць адрозненні разам %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "Параўнанне" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "і" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "на %s больш" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "версіі" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "Імя форка %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "Pull-запыт %s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "[выдалены] рэпазітар" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "[створаны] рэпазітар" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[створаны] рэпазітар як форк" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "[форкнуты] рэпазітар" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "[абноўлены] рэпазітар" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "[загружаны] архіў з рэпазітара" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "[выдалены] рэпазітар" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "[створаны] карыстальнік" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "[абноўлены] карыстальнік" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "[створана] група карыстальнікаў" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "[абноўлена] група карыстальнікаў" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "[каментар] да рэвізіі ў рэпазітары" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "[каментар] у pull-запыце для" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "[зачынены] pull-запыт для" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[адпраўлена] у" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[каміт праз Kallithea] у рэпазітары" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[занесены з аддаленага рэпазітара] у рэпазітар" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[занесены] з" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[дададзены ў назіранні] рэпазітар" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[выдалены з назірання] рэпазітар" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " і на %s больш" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Няма файлаў" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "новы файл" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "зменены" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "выдалены" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "пераназваны" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1278,7 +1272,34 @@ "пераназваны з файлавай сістэмы. Калі ласка, перазапусціце прыкладанне для " "сканавання рэпазітароў" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1286,7 +1307,7 @@ msgstr[1] "%d гады" msgstr[2] "%d гадоў" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1294,7 +1315,7 @@ msgstr[1] "%d месяцы" msgstr[2] "%d месяцаў" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1302,7 +1323,7 @@ msgstr[1] "%d дні" msgstr[2] "%d дзён" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1310,7 +1331,7 @@ msgstr[1] "%d гадзіны" msgstr[2] "%d гадзін" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1318,7 +1339,7 @@ msgstr[1] "%d хвіліны" msgstr[2] "%d хвілін" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1326,27 +1347,27 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "у %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "у %s і %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s і %s назад" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "цяпер" @@ -1355,137 +1376,137 @@ msgid "on line %s" msgstr "на радку %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Згадванне]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "верхні ўзровень" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Адміністратар Kallithea" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Несанкцыянаваны доступ да рэсурсу" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 #, fuzzy msgid "Default user has write access to new repositories" msgstr "Несанкцыянаваны доступ да рэсурсу" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "Толькі адміністратары могуць ствараць групы репазітароў" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "Неадміністратары могуць ствараць групы репазітароў" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "Толькі адміністратары могуць ствараць групы карыстальнікаў" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "Неадміністратары могуць ствараць групы карыстальнікаў" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "Толькі адміністратары могуць ствараць рэпазітары верхняга ўзроўню" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "Неадміністратары могуць ствараць рэпазітары верхняга ўзроўню" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "Месцазнаходжанне рэпазітароў" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "Рэгістрацыя адключаная" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "Рэгістрацыя карыстальніка з ручной актывацыяй уліковага запісу" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "Рэгістрацыя карыстальніка з аўтаматычнай актывацыяй" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "Не прагледжана" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "На разглядзе" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Ухвалена" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Ухвалена" @@ -1511,7 +1532,7 @@ msgid "Name must not contain only digits" msgstr "Імя не можа ўтрымліваць толькі лічбы" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, fuzzy, python-format #| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgid "" @@ -1519,72 +1540,72 @@ "%(branch)s" msgstr "[пракаментавана] у запыце на занясенне змен для" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "Новы карыстальнік \"%(new_username)s\" зарэгістраваны" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, 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:171 +#: kallithea/model/notification.py:170 #, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "Зачынены" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, 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/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| msgid "Error creating pull request: %s" msgid "Cannot create empty pull request" msgstr "Памылка пры стварэнні pull-запыту: %s" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 #, 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 +#: kallithea/model/pull_request.py:339 #, fuzzy #| msgid "Missing changesets since the previous pull request:" msgid "Missing changesets since the previous iteration:" msgstr "Адсутныя рэвізіі адносна папярэдняга pull-запыту:" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, 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 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, fuzzy, python-format msgid "" "This iteration is based on another %s revision and there is no simple " @@ -1592,33 +1613,49 @@ msgstr "" "Гэты pull-запыт заснаваны на іншай рэвізіі %s, просты diff немагчымы." -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, 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 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "апошняя версія" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Changeset %s not found" +msgid "SSH key %r not found" +msgstr "Набор змен %s не знойдзены" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "Рэгістрацыя новага карыстальніка" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" "Вы не можаце выдаліць карыстальніка, паколькі гэта крытычна для працы " "ўсёй праграмы" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1628,7 +1665,7 @@ "таму не можа быць выдалены. Змяніце ўладальніка ці выдаліце гэтыя " "рэпазітары: %s" -#: kallithea/model/user.py:263 +#: kallithea/model/user.py:260 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " @@ -1638,7 +1675,7 @@ "і таму не можа быць выдалены. Змяніце ўладальніка ці выдаліце гэтая " "групы: %s" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:267 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1648,36 +1685,36 @@ "карыстальнікаў і таму не можа быць выдалены. Змяніце ўладальніка ці " "выдаліце гэтыя групы: %s" -#: kallithea/model/user.py:364 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "Спасылка скіду пароля" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "Паведамленне пра скіданне пароля" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "Значэнне не можа быць пустым спісам" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Карыстальнік з імем \"%(username)s\" ужо існуе" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Імя \"%(username)s\" недапушчальнае" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 msgid "" "Username may only contain alphanumeric characters underscores, periods or " "dashes and must begin with an alphanumeric character or underscore" @@ -1686,25 +1723,25 @@ "падкрэслення, кропкі і працяжнік; а гэтак жа павінна пачынацца з літары, " "лічбы або са знака падкрэслення" -#: kallithea/model/validators.py:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "Імя \"%(username)s\" недапушчальнае" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Няслушнае імя групы карыстальнікаў" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Група карыстальнікаў \"%(usergroup)s\" ужо існуе" -#: kallithea/model/validators.py:136 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1713,65 +1750,61 @@ "падкрэслення, кропкі і працяжнік; а гэтак жа павінна пачынацца з літары " "ці лічбы" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Немагчыма выкарыстоўваць гэту групу як бацькоўскую" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Група \"%(group_name)s\" ужо існуе" -#: kallithea/model/validators.py:179 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Рэпазітар з імем \"%(group_name)s\" ужо існуе" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Недапушчальныя знакі (не ascii) у паролі" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Няслушна зададзены стары пароль" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Паролі не супадаюць" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "Няслушнае імя ці пароль" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "Несупадзенне токенаў" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Імя рэпазітара %(repo)s забароненае" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Рэпазітар %(repo)s ужо існуе" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Рэпазітар \"%(repo)s\" ужо існуе ў групе \"%(group)s\"" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Група рэпазітароў \"%(repo)s\" ужо існуе" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "Няслушны URL рэпазітара" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -1779,40 +1812,40 @@ "Няслушны URL рэпазітара. Ён мусіць быць карэктным URL http, https, ssh, " "svn+http ці svn+https" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "Тып форка будзе супадаць з бацькоўскім" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "У вас недастаткова правоў для стварэння рэпазітароў у гэтай групе" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "недастаткова правоў для стварэння рэпазітара ў каранёвым каталогу" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "У Вас недастаткова прывілеяў для стварэння групы ў гэтым месцы" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "Дадзенае імя карыстальніка ці групы карыстальнікаў недапушчальна" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "Гэты шлях хібны" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "Гэты e-mail ужо ўжываецца" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "Email-адрас \"%(email)s\" не знойдзены" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1820,11 +1853,11 @@ "Для ўваходу па LDAP павінна быць паказана значэнне атрыбута CN - гэта " "эквівалент імя карыстальніка" -#: kallithea/model/validators.py:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Калі ласка, увядзіце існы IPv4 ці IPv6 адрас" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" @@ -1832,17 +1865,17 @@ "Значэнне маскі падсеткі павінна быць у межах ад 0 да 32 (%(bits)r - " "няслушна)" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Ключавое імя можа толькі складацца з літар, знака падкрэслення, працяжнік " "ці лікаў" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "Файла няма ў каталогу" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1884,24 +1917,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "Апісанне" @@ -1918,7 +1957,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1926,11 +1965,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "Уладальнік" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "Увайсці" @@ -1945,7 +1984,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1953,7 +1992,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "Пароль" @@ -2113,10 +2152,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Дзеянне" @@ -2167,22 +2208,22 @@ msgstr "Плагін" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "Захаваць" @@ -2200,14 +2241,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2215,36 +2256,25 @@ msgstr "Прыватныя рэпазітары бачныя толькі іх удзельнікам." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "Уключыць статыстыку" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "Уключыць акно статыстыкі на старонцы «Агульныя звесткі»." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "Уключыць спампоўку" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "Уключыць блакаванне" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "Уключыць аўтаблакаванне для рэпазітара." - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2291,8 +2321,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "Ніколі" @@ -2325,7 +2357,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "Стварыць новы gist-запіс" @@ -2361,23 +2393,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2405,7 +2439,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2465,7 +2499,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "Мой Акаўнт" @@ -2478,25 +2512,32 @@ msgid "Email Addresses" msgstr "E-mail адрэсы" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +#| msgid "API Keys" +msgid "SSH Keys" +msgstr "API-ключы" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "API-ключы" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 msgid "Owned Repositories" msgstr "Мае рэпазітары" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Стварыць рэпазітары" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "Паказаць прывілеі" @@ -2523,7 +2564,9 @@ msgstr "Пацвердзіце выдаленне гэтага API-ключа: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "Выдаліць" @@ -2539,12 +2582,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "Дадаць" @@ -2646,6 +2691,49 @@ msgid "Name" msgstr "Імя" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "Прозвішча" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +#| msgid "Confirm to remove this API key: %s" +msgid "Confirm to remove this SSH key: %s" +msgstr "Пацвердзіце выдаленне гэтага API-ключа: %s" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +#| msgid "New API key" +msgid "New SSH key" +msgstr "Новы API-ключ" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public repository" +msgid "Public key" +msgstr "Публічны рэпазітар" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Рэпазітары, за якімі Вы назіраеце" @@ -2662,7 +2750,7 @@ msgstr "Глабальныя" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "Белы спіс IP" @@ -2703,7 +2791,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2871,7 +2959,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "Дадаткова" @@ -2985,19 +3073,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "Выдаліць гэту групу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "Пацвердзіце выдаленне гэтай групы карыстальнікаў" @@ -3027,7 +3107,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3036,7 +3116,7 @@ "README." #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Апцыянальна абраць групу, у якую змясціць дадзены рэпазітар." @@ -3046,7 +3126,7 @@ msgstr "Тып стваранага рэпазітара." #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Рэвізія для выгрузкі" @@ -3098,8 +3178,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "Статыстыка" @@ -3135,54 +3215,17 @@ "Усе выконваемыя з гэтым рэпазітаром дзеянні будуць адлюстроўвацца ў " "публічным журнал." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" -msgstr "Уключыць блакаванне" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "Пацвердзіце разблакаванне рэпазітара." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "Разблакаваць рэпазітар" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "Заблакавана %s %s" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "Пацвердзіце блакаванне рэпазітара." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "Заблакаваць рэпазітар" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "Рэпазітар не заблакаваны" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Пацвердзіце выдаленне гэтага рэпазітара: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Delete this Repository" msgstr "Выдаліць гэты рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3190,15 +3233,15 @@ msgstr[1] "Дадзены рэпазітар мае %s копіі" msgstr[2] "Дадзены рэпазітар мае %s копій" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "Адлучыць форкі" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "Выдаліць форкі" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3297,19 +3340,13 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#, fuzzy +#| msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "Пастаяннае ШВ рэпазітара" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "Што гэта?" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3319,31 +3356,31 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Аддалены рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "URL рэпазітара" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Рэвізія па змоўчанні, з якой будзе рабіцца выгрузка файлаў пры спампоўцы" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "Змяніць уладальніка рэпазітара." @@ -3452,8 +3489,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "Захаваць налады" @@ -3550,10 +3587,6 @@ msgid "Kallithea version" msgstr "Версія Kallithea" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "Праверыць наяўнасць абнаўленняў" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3574,15 +3607,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3591,40 +3616,32 @@ msgstr "Паказваць памер рэпазітара пасля адпраўкі" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "Лагаваць карыстацкія каманды адпраўкі" - -#: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "Лагаваць карыстацкія каманды атрымання" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Абнаўляць рэпазітар пасля адпраўкі (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Mercurial extensions" msgstr "Пашырэнні Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "Уключыць падтрымку вялікіх файлаў" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "Уключыць падтрымку hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 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/templates/admin/settings/settings_vcs.html:47 msgid "Location of repositories" msgstr "Месцазнаходжанне рэпазітароў" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect." @@ -3632,7 +3649,7 @@ "Націсніце для разблакавання. Змены набудуць моц пасля перазагрузкі " "Kallithea." -#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3681,8 +3698,9 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +#, fuzzy +#| msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "URL для кланавання" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3700,16 +3718,33 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +#| msgid "Clone URL" +msgid "SSH Clone URL" +msgstr "URL для кланавання" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repository Size" msgid "Repository page size" msgstr "Памер рэпазітара" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 #, fuzzy msgid "" "Number of items displayed in the repository pages before pagination is " @@ -3718,43 +3753,43 @@ "Колькасць элементаў, што паказваюцца на галоўнай старонцы панэлі " "кіравання перад паказам нумарацыі старонак." -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "Абразкі" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "Паказваць абразкі публічных рэпазітароў" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "Паказваць абразкі прыватных рэпазітароў" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "Паказваць абразкі публічных рэпазітароў." -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "Метатэгаванне" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3915,12 +3950,12 @@ msgstr "Падтрымка" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Рэпазітар Mercurial" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Git рэпазітар" @@ -3968,157 +4003,132 @@ msgstr "Параўнаць" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Пошук" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "Разблакаваць" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "Заблакаваць" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "Назіраць" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "Не назіраць" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Стварыць pull-запыт" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "Пераключыцца на" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "Супадзенняў не знойдзена" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Show recent activity" msgstr "Паказаць апошнюю актыўнасць" -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/base/base.html:296 msgid "Public journal" msgstr "Агульнадаступны журнал" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:301 msgid "Show public gists" msgstr "Паказаць публічныя запісы" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 msgid "Gists" msgstr "Gist" -#: kallithea/templates/base/base.html:313 +#: kallithea/templates/base/base.html:306 msgid "All Public Gists" msgstr "Усе публічныя Gist-запісы" -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:308 msgid "My Public Gists" msgstr "Мае публічныя Gist-запісы" -#: kallithea/templates/base/base.html:316 +#: kallithea/templates/base/base.html:309 msgid "My Private Gists" msgstr "Мае прыватныя Gist-запісы" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "Пошук па рэпазітарах" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Мае pull-запыты" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "Не аўтарызаваны" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "Аўтарызавацца" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "Забыліся на пароль?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "Няма акаўнта?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "Выйсці" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" -msgstr "Ужываць значэнні па змоўчанні" - -#: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "Стандартныя прывілеі" - -#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Стварыць рэпазітары" -#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/templates/base/default_perms_box.html:15 msgid "Select this option to allow repository creation for this user" msgstr "Опцыя дазваляе карыстальніку ствараць рэпазітары" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "Ствараць групы карыстальнікаў" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "Опцыя дазваляе карыстальніку ствараць групы карыстальнікаў" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "Ствараць fork ад рэпазітароў" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" "Абярыце гэту опцыю каб дазволіць дадзенаму карыстальніку ствараць форкі " @@ -4873,7 +4883,7 @@ msgstr "Параўнанне файла %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "%s Файлы" @@ -4885,7 +4895,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "Дадаць новы файл" @@ -4937,7 +4947,7 @@ msgstr "Загружаецца спіс файлаў..." #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "Памер" @@ -5067,8 +5077,8 @@ msgstr "%s Назіральнікі" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "Назіральнікі" @@ -5121,8 +5131,8 @@ msgstr "Форкі %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "Адгалінаванні" @@ -5434,9 +5444,9 @@ msgid "File names" msgstr "Імя файла" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Недастаткова правоў" @@ -5446,20 +5456,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "Atom стужка рэпазітара %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "RSS стужка рэпазітара %s" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "Уключана" @@ -5468,12 +5478,12 @@ msgstr "Атрыманая статыстыка: " #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "файлы" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "Паказаць яшчэ" @@ -5514,94 +5524,190 @@ msgid "%s Summary" msgstr "%s агульныя звесткі" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "Рэпазітар заблакаваны %s" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "Рэпазітар разблакаваны" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "Форк ад" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "Кланаваць з" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "Паводле ID" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "URL для кланавання" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "Паводле імя" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "Прозвішча" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "Папулярныя файлы" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "Спампаваць" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "Спамповак яшчэ няма" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "Спампоўванне адключанае ў гэтым рэпазітары" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "Спамповак яшчэ няма" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "Спампоўванне адключанае ў гэтым рэпазітары" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "Спампаваць у zip" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "Адзначце для спампоўкі архіва з даччынымі рэпазітарамі" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "З даччынымі рэпазітарамі" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "Стужка навін" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "Апошнія змены" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "Хуткі старт" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "Дадаць ці загрузіць файлы праз Kallithea" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 msgid "Push new repository" msgstr "Адправіць новы рэпазітар" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "Існы рэпазітар?" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "Спампаваць %s як %s" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Рэпазітар заблакаваў %s у %s" + +#~ msgid "Repository has been locked" +#~ msgstr "Рэпазітар заблакаваны" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Рэпазітар разблакаваны" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Памылка падчас разблакавання" + +#~ msgid "Invalid API key" +#~ msgstr "Няслушны API-ключ" + +#~ msgid "Token mismatch" +#~ msgstr "Несупадзенне токенаў" + +#~ msgid "Enable locking" +#~ msgstr "Уключыць блакаванне" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "Уключыць аўтаблакаванне для рэпазітара." + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "" +#~ "Уключыць аўтаблакоўку для групы. Гэта опцыя будзе ўжыта да ўсіх " +#~ "даччыных груп і рэпазітарам" + +#~ msgid "Change Locking" +#~ msgstr "Уключыць блакаванне" + +#~ msgid "Confirm to unlock repository." +#~ msgstr "Пацвердзіце разблакаванне рэпазітара." + +#~ msgid "Unlock Repository" +#~ msgstr "Разблакаваць рэпазітар" + +#~ msgid "Locked by %s on %s" +#~ msgstr "Заблакавана %s %s" + +#~ msgid "Confirm to lock repository." +#~ msgstr "Пацвердзіце блакаванне рэпазітара." + +#~ msgid "Lock Repository" +#~ msgstr "Заблакаваць рэпазітар" + +#~ msgid "Repository is not locked" +#~ msgstr "Рэпазітар не заблакаваны" + +#~ msgid "What is that?" +#~ msgstr "Што гэта?" + +#~ msgid "Check for updates" +#~ msgstr "Праверыць наяўнасць абнаўленняў" + +#~ msgid "Log user push commands" +#~ msgstr "Лагаваць карыстацкія каманды адпраўкі" + +#~ msgid "Log user pull commands" +#~ msgstr "Лагаваць карыстацкія каманды атрымання" + +#~ msgid "Unlock" +#~ msgstr "Разблакаваць" + +#~ msgid "Lock" +#~ msgstr "Заблакаваць" + +#~ msgid "Inherit defaults" +#~ msgstr "Ужываць значэнні па змоўчанні" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "Стандартныя прывілеі" + +#~ msgid "Repository locked by %s" +#~ msgstr "Рэпазітар заблакаваны %s" + +#~ msgid "Repository unlocked" +#~ msgstr "Рэпазітар разблакаваны" + +#~ msgid "Show by ID" +#~ msgstr "Паводле ID" + +#~ msgid "Show by Name" +#~ msgstr "Паводле імя" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "Індэксы адсутнічаюць. Калі ласка, запусціце індэксатар Whoosh" @@ -5852,9 +5958,6 @@ #~ msgid "invalid user name" #~ msgstr "няслушнае імя карыстальніка" -#~ msgid "Your account is disabled" -#~ msgstr "Ваш акаўнт выключаны" - #~ msgid "invalid clone URL" #~ msgstr "няслушны URL для кланавання"
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,12 +1,11 @@ # Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2015-11-12 08:51+0000\n" "Last-Translator: Michal Čihař <michal@cihar.com>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/kallithea/" @@ -19,14 +18,14 @@ "X-Generator: Weblate 2.5-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,104 +34,104 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(zavřeno)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy msgid "No permission to change status" msgstr "Změny" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "Taková revize neexistuje" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, fuzzy, python-format #| msgid "Go to tip of repository" msgid "Could not find other repository %s" msgstr "Prázdný repozitář" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 #, fuzzy msgid "No response" msgstr "Neznámá revize %s" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 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:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -142,121 +141,115 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Změny na repozitáři %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 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:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Zatím nejsou žádné soubory. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Žádné změny" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Přidaný soubor přes Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Žádný obsah" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Stahování vypnuto" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Neznámá revize %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Prázdný repozitář" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Změny" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Větve" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Tagy" @@ -265,11 +258,11 @@ msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -277,177 +270,177 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repozitáře" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Větev" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Špatná captcha" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (zavřené)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -463,21 +456,21 @@ msgid "An error occurred during search operation." msgstr "Došlo k chybě při vyhledávání." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" @@ -489,123 +482,135 @@ msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 minut" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 hodina" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 den" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 měsíc" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Došlo k chybě při vytváření gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:166 +#: 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:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 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:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +msgid "SSH key successfully deleted" +msgstr "Úspěšně aktualizované heslo" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -613,9 +618,9 @@ msgid "Read" msgstr "" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -623,9 +628,9 @@ msgid "Write" msgstr "" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -648,362 +653,347 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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:42 -#: kallithea/templates/base/root.html:50 -msgid "Disabled" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 -msgid "Allowed with manual account activation" +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" msgstr "" #: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Nic" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Repozitář byl uzamčen" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Repozitář byl odemčen" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format #| msgid "Watched Repositories" msgid "Invalidated %s repositories" msgstr "Repozitáře" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "" +#: kallithea/controllers/admin/settings.py:357 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + #: kallithea/controllers/admin/settings.py:360 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - -#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1033,219 +1023,219 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "Změny" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1253,7 +1243,34 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1261,7 +1278,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1269,7 +1286,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1277,7 +1294,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1285,7 +1302,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1293,7 +1310,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1301,27 +1318,27 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "" @@ -1330,135 +1347,135 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 #, fuzzy msgid "Only admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1484,303 +1501,315 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "SSH key %r not found" +msgstr "Změny" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 #, fuzzy msgid "Invalid repository URL" msgstr "Prázdný repozitář" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1821,24 +1850,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1855,7 +1890,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1863,11 +1898,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1882,7 +1917,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1890,7 +1925,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -2047,10 +2082,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2099,22 +2136,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2133,14 +2170,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2148,36 +2185,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2224,8 +2250,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2258,7 +2286,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2294,23 +2322,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2338,7 +2368,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2398,7 +2428,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2411,26 +2441,31 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 #, fuzzy msgid "Owned Repositories" msgstr "Repozitáře" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Repozitáře" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2457,7 +2492,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2473,12 +2510,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2580,6 +2619,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 #, fuzzy msgid "Repositories You are Watching" @@ -2597,7 +2672,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2634,7 +2709,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2794,7 +2869,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "Pokročilé" @@ -2903,17 +2978,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2943,14 +3012,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2960,7 +3029,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -3012,8 +3081,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -3047,58 +3116,18 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -#, fuzzy -msgid "Unlock Repository" -msgstr "Prázdný repozitář" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, fuzzy -msgid "Confirm to lock repository." -msgstr "Prázdný repozitář" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -#, fuzzy -msgid "Lock Repository" -msgstr "Prázdný repozitář" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 #, fuzzy msgid "Delete this Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3106,15 +3135,15 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3217,20 +3246,12 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 #, fuzzy -msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3240,32 +3261,32 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy msgid "Remote repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 #, fuzzy msgid "Repository URL" msgstr "Repozitáře" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3375,8 +3396,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 #, fuzzy msgid "Save Settings" msgstr "Nastavení" @@ -3472,10 +3493,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3496,15 +3513,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3513,47 +3522,39 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 #, fuzzy msgid "Location of repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3602,8 +3603,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3621,59 +3621,74 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repositories" msgid "Repository page size" msgstr "Repozitáře" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 #, fuzzy msgid "Meta Tagging" msgstr "Nastavení" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3834,12 +3849,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3887,152 +3902,128 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "Repozitáře" +msgid "Create repositories" +msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -msgid "default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4766,7 +4757,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4778,7 +4769,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4831,7 +4822,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4960,8 +4951,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -5012,8 +5003,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5320,9 +5311,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5332,20 +5323,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5354,12 +5345,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5400,96 +5391,122 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 #, fuzzy msgid "Latest Changes" msgstr "Změna stavu-> %s" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "Prázdný repozitář" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "" +#~ msgid "Repository has been locked" +#~ msgstr "Repozitář byl uzamčen" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Repozitář byl odemčen" + +#, fuzzy +#~ msgid "Unlock Repository" +#~ msgstr "Prázdný repozitář" + +#, fuzzy +#~ msgid "Confirm to lock repository." +#~ msgstr "Prázdný repozitář" + +#, fuzzy +#~ msgid "Lock Repository" +#~ msgstr "Prázdný repozitář" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "Repozitáře" + #, fuzzy #~| msgid "Repository URL" #~ msgid "Repository Group"
--- a/kallithea/i18n/da/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/da/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2017 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-03-14 01:03+0000\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Language-Team: Danish <https://hosted.weblate.org/projects/kallithea/" @@ -18,14 +17,14 @@ "X-Generator: Weblate 3.5.1\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Der er ingen changesets endnu" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,94 +33,94 @@ msgid "None" msgstr "Ingen" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(lukket)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Vis mellemrum" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorer mellemrum" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Øg diff konteksten med %(num)s linjer" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permission to change pull request status" msgid "No permission to change status" msgstr "Ingen tilladelse til ændring af status for pull-forespørgsel" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "Pull-forespørgsel %s slettet successfuldt" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "En sådan revision findes ikke for dette repository" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "Kunne ikke finde andet repository %s" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "Kan ikke sammenligne repositories af forskellige typer" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 msgid "Cannot show empty diff" msgstr "Kan ikke vise en tom diff" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "Ingen forfader fundet for merge diff" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "Flere merge forfædre fundet for merge sammenligning" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "Kan ikke sammenligne repositories uden en fælles forfader" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Intet svar" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Ukendt fejl" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" "Forespørgslen kunne ikke forstås af serveren på grund af fejlformet " "syntaks." -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Uautoriseret adgang til ressource" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "Du har ikke tilladelse til at se denne side" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Kunne ikke finde ressourcen" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -129,12 +128,12 @@ "Serveren stødte på en uventet tilstand, som forhindrede den i at opfylde " "anmodningen." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s committed den %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -144,109 +143,103 @@ msgid "Changeset was too big and was cut off..." msgstr "Changesettet var for stor og blev afskåret..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "Feed for %s %s" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Ændringer på repository %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Klik her for at tilføje en ny fil" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Der er ingen filer endnu. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s fra %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Dette repository er låst af %s den %s" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "Du kan kun slette filer, hvor revisionen er en gyldig branch" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Slettet fil %s via Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Successfuldt slettet filen %s" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Fejl opstået under commit" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "Du kan kun redigere filer, hvor revisionen er en gyldig branch" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Redigeret fil %s via Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Ingen ændringer" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Successfuldt committed til %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Tilføjet fil via Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Intet indhold" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Intet filnavn" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Placeringen skal være en relativ sti og må ikke indeholde .. i stien" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Downloads er deaktiveret" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Ukendt revision %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Tomt repository" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Ukendt arkivtype" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 @@ -254,14 +247,14 @@ msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 #, fuzzy msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Tags" @@ -270,11 +263,11 @@ msgid "An error occurred during repository forking %s" msgstr "Der opstod en fejl under repository forking %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Grupper" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -282,12 +275,12 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 #, fuzzy msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 @@ -295,164 +288,164 @@ msgid "Branch" msgstr "Branch" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Lukkede Branches" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Bogmærke" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Offentlig journal" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Journal" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Dårlig captcha" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Du har succesfuldt registreret med %s" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "En bekræftelseskode til ændring af adgangskode er sendt" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Ugyldig token for ændring af adgangskode" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Successfuld ændring af adgangskode" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Ugyldig reviewer \"%s\" angivet" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (lukket)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 #, fuzzy msgid "Changeset" msgstr "Changeset" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Speciel" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Bogmærker" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Fejl ved oprettelse af pull-forespørgsel: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Der opstod en fejl under oprettelse af pull-forespørgsel" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Åbnede ny pull-forespørgsel med success" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "Ny pull-forespørgsel iteration oprettet" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "I mellemtiden er de følgende reviewers tilføjet: %s" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "I mellemtiden er de følgende reviewers fjernet: %s" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Ingen beskrivelse" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Pull-forespørgsel opdateret" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Slettede pull-forespørgsel med success" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "Revision %s er ikke fundet i %s" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" "Fejl: Changesets ikke fundet, ved visning af pull-forespørgsel fra %s." -#: kallithea/controllers/pullrequests.py:522 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Denne pull-forespørgsel er allerede merged til %s." -#: kallithea/controllers/pullrequests.py:524 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Denne pull-forespørgsel er lukket og kan ikke opdateres." -#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "Følgende yderligere ændringer er tilgængelige på %s:" -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" "Ingen yderligere changesets fundet ved iteration på denne pull-" "forespørgsel." -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Bemærk: Branch %s har et andet head: %s." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 msgid "Git pull requests don't support iterating yet." msgstr "Git pull-forespørgsler supportere ej iteration endnu." -#: kallithea/controllers/pullrequests.py:566 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." @@ -460,7 +453,7 @@ "Fejl: Nogle changesets kunne ikke findes ved visning af pull-forespørgsel " "fra %s." -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" "Diff'en kunne ikke vises - pull-forespørgslens revisions kunne ikke " @@ -478,21 +471,21 @@ msgid "An error occurred during search operation." msgstr "Der opstod en fejl under søgning." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Ingen data er klar endnu" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Statistik er slået fra for dette repository" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Auth-indstillinger opdateret successfuldt" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "Der opstod en fejl under opdatering af auth-indstillinger" @@ -504,125 +497,139 @@ msgid "Error occurred during update of defaults" msgstr "Der opstod en fejl under opdatering af standarder" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "For evigt" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 minutter" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 time" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 dag" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 måned" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: kallithea/templates/admin/my_account/my_account_api_keys.html:65 #: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Levetid" -#: kallithea/controllers/admin/gists.py:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Der opstod en fejl under oprettelse af gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Slettet gist %s" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Uændret" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Opdateret gist-indhold successfuldt" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "Opdateret gist-data successfuldt" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "Der opstod en fejl under opdatering af gist %s" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Du kan ikke redigere denne bruger, da den er afgørende for hele " "applikationen" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Din konto er blevet opdateret successfuldt" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Der opstod en fejl under opdatering af bruger %s" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Der opstod en fejl under opdatering af bruger adgangskode" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "Tilføjet email %s til bruger" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "Der opstod en fejl under tilføjelse af email" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "Fjernet email fra brugeren" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API-nøgle oprettet successfuldt" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-nøgle nulstillet successfuldt" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-nøgle slettet successfuldt" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "API-nøgle oprettet successfuldt" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "API-nøgle slettet successfuldt" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -630,9 +637,9 @@ msgid "Read" msgstr "Læs" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -640,9 +647,9 @@ msgid "Write" msgstr "Skriv" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -665,256 +672,241 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Admin" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Deaktiveret" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Tilladt med manuel kontoaktivering" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Tilladt med automatisk kontoaktivering" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Manuel aktivering af ekstern konto" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 msgid "Automatic activation of external account" msgstr "Automatisk aktivering af ekstern konto" -#: 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Aktiveret" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "Globale tilladelser opdateret" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Der opstod en fejl under opdatering af tilladelser" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Der opstod en fejl under oprettelse af repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Oprettet repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Opdateret repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Der opstod en fejl under opdatering af repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Denne gruppe indeholder %s repositories og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Denne gruppe indeholder %s undergrupper og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Fjernet repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Der opstod en fejl under sletning af repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "Kan ikke tilbagekalde tilladelse for én selv som admin" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Repository-gruppe tilladelser opdateret" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "Der opstod en fejl under tilbagekaldelse af tilladelse" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Fejl ved oprettelse af repository %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Oprettet repository %s fra %s" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Forked repository %s som %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Oprettet repository %s" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s opdateret" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "Der opstod en fejl under opdatering af repository %s" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "Fraskilt %s forks" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "Slettet %s forks" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Slettet repository %s" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Kan ikke slette repository %s, da den stadig har forks" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "Der opstod en fejl under sletning af %s" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Repository tilladelser opdateret" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "Feltvaliderings fejl: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Der opstod en fejl under oprettelse af felt: %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Der opstod en fejl under fjernelse af feltet" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Ikke en fork --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Opdateret repository's synlighed i den offentlige journal" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" "Der opstod en fejl under indstilling af dette repository, i den " "offentlige journal" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Intet" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Mærket repository %s som fork af %s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Der opstod en fejl under denne operation" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Repository er blevet låst" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "Ugyldiggørelse af cache er succesfuld" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Repository er blevet låst op" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Der opstod en fejl ved oplåsning" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "Ugyldiggørelse af cache er succesfuld" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Der opstod en fejl under cache ugyldiggørelse" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 #, fuzzy msgid "Pulled from remote location" msgstr "Pulled fra remote placering" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "Der opstod en fejl under pull fra remote placering" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "Der opstod en fejl under sletning af repository statistik" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "Opdateret VCS-indstillinger" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -922,110 +914,110 @@ "Ude af stand til at aktivere hgsubversion understøttelse. \"hgsubversion" "\" biblioteket mangler" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "Der opstod en fejl ved opdatering af applikationsindstillinger" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Repositories genscannet successfuldt. Tilføjet: %s. Fjernet: %s." -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "Ugyldiggjort %s repositories" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "Opdateret applikationsindstillinger" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Opdateret visualiseringsindstillinger" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Der opstod en fejl under opdatering af visualiseringsindstillinger" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Indtast email-adresse" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Send email-opgave oprettet" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Ingen data er klar endnu" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Tilføjet nyt hook" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Opdateret hooks" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Der opstod en fejl under oprettelse af et hook" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whoosh reindex-opgave skeduleret" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Oprettet brugergruppe %s" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Der opstod en fejl under oprettelse af brugergruppe %s" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Opdateret brugergruppe %s" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "Der opstod en fejl under opdatering af brugergruppe %s" -#: kallithea/controllers/admin/user_groups.py:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "Brugergruppe slettet succesfuldt" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 msgid "An error occurred during deletion of user group" msgstr "Der opstod en fejl under sletning af brugergruppe" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "Brugergrupper-tilladelser opdateret" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "Tilladelser opdateret" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "Der opstod en fejl under gemning af tilladelser" @@ -1055,220 +1047,220 @@ msgid "The default user cannot be edited" msgstr "Standardbrugeren kan ikke redigeres" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Tilføjet IP-adresse %s til bruger-whitelist" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "Der opstod en fejl under tilføjelse af IP-adresse" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "Fjernet IP-adresse fra bruger-whitelist" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "Du skal være registreret bruger for at kunne udføre denne handling" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "Du skal være logget ind for at se denne side" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "Ugyldig API-nøgle" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "CSRF-token lækage opdaget, alle form-tokens er invalideret" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "Repository ikke fundet i filsystemet" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "Changeset for %s %s ikke fundet i %s" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Binær fil" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Changeset var for stor, og blev afskåret, brug diff menu for at få vist " "denne diff" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "Ingen ændringer fundet" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "Slettet branch: %s" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "Oprettet tag: %s" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "Changeset %s ikke fundet" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Vis alle kombineret changesets %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "Sammenlign visning" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "og" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "%s flere" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "revisioner" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "Fork-navn %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "Pull-forespørgsel %s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "[slettet] repository" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "[oprettet] repository" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[oprettet] repository som fork" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "[forked] repository" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "[opdateret] repository" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "[hentet] arkiv fra repository" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "[slettet] repository" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "[oprettet] bruger" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "[opdateret] bruger" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "[oprettet] brugergruppe" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "[opdateret] brugergruppe" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "[kommenterede] på revision i repository" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "[kommenterede] på pull-forespørgsel for" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "[lukket] pull-forespørgsel for" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[pushed] ind i" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[committed via kallithea] ind i repository" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[pulled fra remote] ind i repository" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[pulled] fra" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[begyndt at følge] repository" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[stoppet at følge] repository" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " og %s flere" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Ingen filer" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "ny fil" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "del" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "omdøb" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1278,69 +1270,96 @@ "%s repository er ikke knyttet til db, måske var det skabt eller omdøbt " "fra filsystemet, kør applikationen igen for at scanne repositories" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "i %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "%s siden" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "i %s og %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s og %s siden" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "lige nu" @@ -1349,136 +1368,136 @@ msgid "on line %s" msgstr "på linje %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Omtale]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "top-niveau" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Kallithea Administrator" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "Standard-bruger har ikke adgang til nye repositories" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "Standard-bruger har læse-adgang til nye repositories" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "Standard-bruger har skrive-adgang til nye repositories" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "Standard-bruger har admin-adgang til nye repositories" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "Standard-bruger har ikke adgang til nye repository-grupper" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "Standard-bruger har læse-adgang til nye repository-grupper" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "Standard-bruger har skrive-adgang til nye repository-grupper" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "Standard-bruger har admin-adgang til nye repository-grupper" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "Standard-bruger har ikke adgang til nye brugergrupper" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "Standard-bruger har læse-adgang til nye brugergrupper" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "Standard-bruger har skrive-adgang til nye brugergrupper" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "Standard-bruger har admin-adgang til nye brugergrupper" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "Kun administratorer kan oprette repository-grupper" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "Ikke-administratorer kan oprette repository-grupper" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "Kun administratorer kan oprette brugergrupper" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "Ikke-administratorer kan oprette brugergrupper" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "Kun administratorer kan oprette top-niveau repositories" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "Ikke-administratorer kan oprette top-niveau repositories" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "Repository oprettelse aktiveret med skriveadgang til en repository-gruppe" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "Repository oprettelse deaktiveret med skriveadgang til en repository-" "gruppe" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "Kun admins kan fork repositories" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "Ikke-administratorer kan forke repositories" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "Registrering deaktiveret" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "Brugerregistrering med manuel kontoaktivering" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "Brugerregistrering med automatisk kontoaktivering" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "Ikke gennemgået" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "Under gennemgang" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "Ikke godkendt" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Godkendt" @@ -1504,7 +1523,7 @@ msgid "Name must not contain only digits" msgstr "Navn må ikke kun indeholde cifre" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " @@ -1513,12 +1532,12 @@ "[Kommentar] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" på " "%(branch)s" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "Ny bruger %(new_username)s registreret" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, python-format msgid "" "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " @@ -1527,7 +1546,7 @@ "[Gennemgang] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" fra " "%(pr_source_branch)s af %(pr_owner_username)s" -#: kallithea/model/notification.py:171 +#: kallithea/model/notification.py:170 #, python-format msgid "" "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " @@ -1536,11 +1555,11 @@ "[Kommentar] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" fra " "%(pr_source_branch)s af %(pr_owner_username)s" -#: kallithea/model/notification.py:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "Lukning" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" @@ -1548,266 +1567,278 @@ "%(user)s vil have dig til at gennemgå pull-forespørgsel %(pr_nice_id)s: " "%(pr_title)s" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "Kan ikke oprette en tom pull-forespørgsel" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Changeset %s not found" +msgid "SSH key %r not found" +msgstr "Changeset %s ikke fundet" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1848,24 +1879,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1882,7 +1919,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1890,11 +1927,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1909,7 +1946,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1917,7 +1954,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -2073,10 +2110,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2125,22 +2164,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2158,14 +2197,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2173,36 +2212,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2249,8 +2277,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2283,7 +2313,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2319,23 +2349,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2363,7 +2395,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2423,7 +2455,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2436,24 +2468,29 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 -msgid "API Keys" -msgstr "" - #: kallithea/templates/admin/my_account/my_account.html:29 -msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:30 -#: kallithea/templates/journal/journal.html:33 -msgid "Watched Repositories" +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:32 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:33 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2480,7 +2517,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2496,12 +2535,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2602,6 +2643,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" @@ -2618,7 +2695,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2654,7 +2731,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2814,7 +2891,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2920,17 +2997,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2958,14 +3029,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2975,7 +3046,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -3027,8 +3098,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -3062,69 +3133,32 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3221,19 +3255,11 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "Permanent URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3243,30 +3269,30 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3375,8 +3401,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "" @@ -3471,10 +3497,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3495,15 +3517,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3512,46 +3526,38 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3600,8 +3606,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3619,56 +3624,71 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Repository page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3829,12 +3849,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3882,153 +3902,128 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" +msgid "Create repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Updated permissions" -msgid "default permissions" -msgstr "Tilladelser opdateret" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4737,7 +4732,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4749,7 +4744,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4801,7 +4796,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4929,8 +4924,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -4981,8 +4976,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5288,9 +5283,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5300,20 +5295,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5322,12 +5317,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5368,94 +5363,118 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" +msgid "Add or upload files directly via Kallithea" msgstr "" #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Dette repository er låst af %s den %s" + +#~ msgid "Repository has been locked" +#~ msgstr "Repository er blevet låst" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Repository er blevet låst op" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Der opstod en fejl ved oplåsning" + +#~ msgid "Invalid API key" +#~ msgstr "Ugyldig API-nøgle" + +#, fuzzy +#~| msgid "Updated permissions" +#~ msgid "default permissions" +#~ msgstr "Tilladelser opdateret" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "Der er intet indekseret til at søge i. Kør whoosh indexer"
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-05-29 22:52+0000\n" "Last-Translator: ssantos <ssantos@web.de>\n" "Language-Team: German <https://hosted.weblate.org/projects/kallithea/" @@ -18,14 +17,14 @@ "X-Generator: Weblate 3.7-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Es gibt noch keine Änderungssätze" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,48 +33,48 @@ msgid "None" msgstr "Keine" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(geschlossen)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Zeige unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignoriere unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Erhöhe diff-Kontext auf %(num)s Zeilen" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permission to change pull request status" msgid "No permission to change status" msgstr "Keine Berechtigung zum Ändern des Status des Pull Requests" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "Pull-Request %s erfolgreich gelöscht" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "Die angegebene Version existiert nicht in diesem Repository" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, 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:72 +#: kallithea/controllers/compare.py:74 #, fuzzy #| msgid "Cannot compare repositories without using common ancestor" msgid "Cannot compare repositories of different types" @@ -83,52 +82,52 @@ "Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht " "möglich" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 msgid "Cannot show empty diff" msgstr "Kann leeren diff nicht anzeigen" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "Es konnte kein Vorfahre für den merge diff gefunden werden" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "Es wurden mehrere merge Vorfahren für den merge Vergleich gefunden" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 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:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Keine Rückmeldung" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 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:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Unauthorisierter Zugang zur Ressource" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "Du hast keine Rechte, um diese Seite zu betrachten" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Die Ressource konnte nicht gefunden werden" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -136,12 +135,12 @@ "Aufgrund einer unerwarteten Gegebenheit konnte der Server diese Anfrage " "nicht vollenden." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s committed am %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -151,125 +150,119 @@ msgid "Changeset was too big and was cut off..." msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s %s Feed" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Änderungen im %s Repository" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 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:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Es gibt hier noch keine Dateien. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s auf %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, 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:311 +#: kallithea/controllers/files.py:296 #, 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:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Datei %s via Kallithea gelöscht" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Datei %s erfolgreich gelöscht" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Während des Commits trat ein Fehler auf" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 #, 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:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Datei %s via Kallithea editiert" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Keine Änderungen" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Der Commit zu %s war erfolgreich" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Datei via Kallithea hinzugefügt" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Kein Inhalt" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Kein Dateiname" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 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:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Downloads gesperrt" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Leeres Repository" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Unbekannter Archivtyp" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Änderungssätze" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Entwicklungszweige" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Tags" @@ -278,11 +271,11 @@ msgid "An error occurred during repository forking %s" msgstr "Während des Forkens des Repositorys trat ein Fehler auf: %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Gruppen" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -290,188 +283,188 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Zweig" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Geschlossene Branches" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Marke" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Lesezeichen" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Öffentliches Logbuch" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Logbuch" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Falsches Captcha" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Sie haben sich erfolgreich bei %s registriert" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "Ihr Link um das Passwort zurückzusetzen wurde versendet" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Ungültiges Token zum Zurücksetzen des Passworts." -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Erfolgreich Kennwort geändert" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Ungültigen Begutachter \"%s\" angegeben" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (geschlossen)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Änderungssatz" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Spezial" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Branches anderer" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Lesezeichen" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Fehler beim Erstellen des Pull-Requests: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Während des Erstellens des Pull Requests trat ein Fehler auf" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Pull Request Update erstellt" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "Es wurden inzwischen folgende Begutachter hinzugefügt: %s" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "Es wurden inzwischen folgende Begutachter entfernt: %s" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Keine Beschreibung" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Pull Request aktualisiert" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Erfolgreich Pull-Request gelöscht" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "Die Revision %s konnte in %s nicht gefunden werden" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, 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:522 +#: kallithea/controllers/pullrequests.py:520 #, 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:524 +#: kallithea/controllers/pullrequests.py:522 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:543 +#: kallithea/controllers/pullrequests.py:541 #, 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:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, 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:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Hinweis: Branch %s hat einen anderen Head: %s." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 #, 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:566 +#: kallithea/controllers/pullrequests.py:564 #, 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:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" "Der diff kann nicht angezeigt werden. Die Pull Request Revisionen konnten " @@ -490,21 +483,21 @@ msgid "An error occurred during search operation." msgstr "Während der Suchoperation trat ein Fehler auf." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Es stehen noch keine Daten zur Verfügung" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Statistiken sind deaktiviert für dieses Repository" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Anmeldeeinstellungen erfolgreich geändert" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "Fehler bei der Änderung der Anmeldeeinstellungen aufgetreten" @@ -516,125 +509,139 @@ 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:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "Immer" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 Minuten" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 Stunde" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 Tag" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 Monat" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Ein fehler trat auf bei der Erstellung des gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "gist %s gelöscht" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Ungeändert" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Erfolgreich Kerninhalt aktualisiert" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "Erfolgreich Kerndaten aktualisiert" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "Fehler beim Aktualisieren der Kerndaten %s" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 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:117 +#: 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:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Fehler beim Aktualisieren der Benutzer %s" -#: kallithea/controllers/admin/my_account.py:166 +#: 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:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "Die EMail Addresse %s wurde zum Benutzer hinzugefügt" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 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:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "Die EMail Addresse wurde vom Benutzer entfernt" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API Key wurde erfolgreich erstellt" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-Schlüssel erfolgreich zurückgesetzt" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-Schlüssel erfolgreich gelöscht" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "API Key wurde erfolgreich erstellt" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "API-Schlüssel erfolgreich gelöscht" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -642,9 +649,9 @@ msgid "Read" msgstr "Lesen" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -652,9 +659,9 @@ msgid "Write" msgstr "Schreiben" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -677,258 +684,243 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Admin" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Deaktiviert" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Erlaubt mit manueller Kontoaktivierung" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Erlaubt mit automatischer Kontoaktivierung" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Manuelle Aktivierung externen Kontos" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Aktiviert" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "Globale Berechtigungen erfolgreich geändert" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Fehler bei der Änderung der globalen Berechtigungen" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, 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:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Repositoriumsgruppe %s erstellt" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Repositoriumsgruppe %s aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, 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:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, 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:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, 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:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Repositoriumsgruppe %s entfernt" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, 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:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "Fehler beim Entzug der Berechtigungen" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Fehler beim Erstellen des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Repositorium %s von %s erstellt" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Aufgespaltenes Repositorium %s zu %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Repositorium erzeugt %s" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "Fehler bei der Aktualisierung des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "%s Spaltung abgetrennt" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "%s Spaltung gelöscht" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Repositorium %s gelöscht" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, 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:290 +#: kallithea/controllers/admin/repos.py:289 #, 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:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Repositoriumsberechtigungen aktualisiert" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "Feldvalidierung fehlgeschlagen: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Fehler beim Entfernen des Feldes" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Keine Abspaltung --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Sichtbarkeit des Repositorys im Öffentlichen Logbuch aktualisiert" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 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:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Nichts" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Während dieser operation trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Repository wurde gesperrt" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "Cache Entfernung war erfolgreich" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Repository nicht mehr gesperrt" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Fehler beim Entsperren" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "Cache Entfernung war erfolgreich" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Währen der Cache Invalidierung trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "Von entferntem Ort übertragen" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 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:579 +#: kallithea/controllers/admin/repos.py:541 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:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "VCS-Einstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -936,121 +928,121 @@ "hgsubversion-Unterstützung konnte nicht aktiviert werden. Die " "\"hgsubversion\"-Bibliothek fehlt" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen " "aufgetreten" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, 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:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format #| msgid "Invalidate Repository Cache" msgid "Invalidated %s repositories" msgstr "Ungültiger Repositorycache" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "Anwendungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Visualisierungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:291 +#: 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:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Bitte gebe eine E-Mailadresse an" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Task zum Versenden von E-Mails erstellt" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Es stehen noch keine Daten zur Verfügung" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" "Die eingebauten Hooks sind schreibgeschützt. Bitte verwenden Sie einen " "anderen Hook-Namen." -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Während der Erzeugung des Hooks ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Nutzergruppe %s erstellt" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, 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:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Aktualisierte Nutzergruppe %s" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, 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:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "Die Nutzergruppe wurde erfolgreich entfernt" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 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:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "Zielgruppe kann nicht die gleiche Gruppe sein" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "Berechtigungen der Benutzergruppe wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "Berechtigungen wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" "Es ist ein Fehler während des Speicherns der Berechtigungen aufgetreten" @@ -1081,224 +1073,226 @@ msgid "The default user cannot be edited" msgstr "Der Standard-Benutzer kann nicht bearbeitet werden" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, 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:418 +#: kallithea/controllers/admin/users.py:415 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:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "IP-Adresse wurde von der Nutzerwhitelist entfernt" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 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:852 +#: kallithea/lib/auth.py:712 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:444 -msgid "Invalid API key" -msgstr "Ungültiger API Key" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" "Es wurde ein CSRF Leck entdeckt. Alle Formular Token sind abgelaufen" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "Das Repository konnte nicht im Filesystem gefunden werden" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "Änderungssatz nicht gefunden" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "Ihr Account wurde Deaktiviert" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Binäre Datei" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 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:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "Keine Änderungen erkannt" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "Branch %s gelöscht" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "Tag %s erstellt" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "Änderungssatz nicht gefunden" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Zeige alle Kombinierten Änderungensätze %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "Vergleichsansicht" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "und" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "%s mehr" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "revisionen" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "Fork Name %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "Pull Request %s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "[gelöscht] Repository" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "[erstellt] Repository" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[erstellt] Repository als Fork" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "[forked] Repository" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "[aktualisiert] Repository" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "Archiv von Repository [heruntergeladen]" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "Repository [gelöscht]" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "Benutzer [erstellt]" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "Benutzer [akutalisiert]" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "Benutzergruppe [erstellt]" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "Benutzergruppe [aktualisiert]" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "Revision [kommentiert] in Repository" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "Pull Request [kommentiert] für" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "Pull Request [geschlossen] für" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[Pushed] in" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[via Kallithea] in Repository [committed]" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[Pulled von Remote] in Repository" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[Pulled] von" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[Following gestartet] für Repository" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[Following gestoppt] für Repository" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " und %s weitere" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Keine Dateien" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "neue Datei" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "entf" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "umbenennen" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1309,69 +1303,96 @@ "es im Dateisystem erstellt oder umbenannt. Bitte starten sie die " "Applikation erneut um die Repositories neu zu Indizieren" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "in %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "vor %s" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "in %s und %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s und %s her" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "jetzt gerade" @@ -1380,140 +1401,140 @@ msgid "on line %s" msgstr "in Zeile %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "höchste Ebene" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Kallithea Administrator" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repositories" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Repositories" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Repositories" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 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:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "Der Standard-Benutzer Admin-Rechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 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:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 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:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "Nur Admins können Repository-Gruppen erstellen" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "Nicht-Admins können Repository-Gruppen erstellen" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "Nur Admins können Benutzer-Gruppen erstellen" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "Nicht-Admins können Benutzer-Gruppen erstellen" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "Nur Admins können Repositories auf oberster Ebene erstellen" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "Nicht-Admins können Repositories oberster Ebene erstellen" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "aktiviert" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "deaktiviert" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "Nur Admins können Repositories forken" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "Nicht-Admins können Repositorys forken" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "Registrierung deaktiviert" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "Benutzerregistrierung mit automatischer Kontoaktivierung" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "Nicht Begutachtet" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "In Begutachtung" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Akzeptiert" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Akzeptiert" @@ -1539,7 +1560,7 @@ msgid "Name must not contain only digits" msgstr "Name darf nicht nur Ziffern enthalten" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, fuzzy, python-format #| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgid "" @@ -1549,74 +1570,74 @@ "Kommentar für %(repo_name)s Changeset %(short_id)s in %(branch)s erstellt " "von %(comment_username)s" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "Neuer Benutzer %(new_username)s registriert" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, 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:171 +#: kallithea/model/notification.py:170 #, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "Schließen" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, 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/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| 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 +#: kallithea/model/pull_request.py:217 #, python-format msgid "" "Cannot create pull request - criss cross merge detected, please merge a " "later %s revision to %s" msgstr "" -"Pull-Request kann nicht erstellt werden - Criss Cross Merge erkannt, bitte " -"eine spätere %s-Revision in %s zusammenführen." - -#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +"Pull-Request kann nicht erstellt werden - Criss Cross Merge erkannt, " +"bitte eine spätere %s-Revision in %s zusammenführen." + +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "Sie sind nicht berechtigt, den Pull-Request anzulegen." -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 #, 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 +#: kallithea/model/pull_request.py:346 #, 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 +#: kallithea/model/pull_request.py:353 #, 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 +#: kallithea/model/pull_request.py:360 #, fuzzy, python-format msgid "" "This iteration is based on another %s revision and there is no simple " @@ -1625,26 +1646,42 @@ "Dieser Pull Request basiert auf einer anderen %s Revision. Daher ist kein " "Simple Diff verfügbar." -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, 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 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "Geschlossen, nächste Iteration: %s ." -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "Letzter Tip" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "SSH key %r not found" +msgstr "Änderungssatz nicht gefunden" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "Neue Benutzerregistrierung" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 #, fuzzy msgid "" "You can't remove this user since it is crucial for the entire application" @@ -1652,7 +1689,7 @@ "Sie können diesen Benutzer nicht löschen, da er von entscheidender " "Bedeutung für die gesamte Applikation ist" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1662,7 +1699,7 @@ "nicht entfernt werden. Entweder muss der Besitzer geändert oder das " "Repository entfernt werden: %s" -#: kallithea/model/user.py:263 +#: kallithea/model/user.py:260 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " @@ -1672,7 +1709,7 @@ "kann daher nicht entfernt werden. Entweder muss der Besitzer geändert " "oder die Repositorygruppen müssen entfernt werden: %s" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:267 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1682,16 +1719,16 @@ "nicht entfernt werden. Entweder muss der Besitzer geändert oder die " "Benutzergruppen müssen gelöscht werden: %s" -#: kallithea/model/user.py:364 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "Link zum Zurücksetzen des Passworts" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 #, fuzzy msgid "Password reset notification" msgstr "Link zum Zurücksetzen des Passworts" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, python-format msgid "" "The password to your account %s has been changed using password reset " @@ -1700,21 +1737,21 @@ "Das Passwort für dein Konto %s wurde mit dem Formular zum Zurücksetzen " "des Passworts geändert." -#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "Eine leere Liste ist kein gültiger Wert" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Benutezrname \"%(username)s\" existiert bereits" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or " @@ -1724,25 +1761,25 @@ "oder Bindestriche enthalten und muss mit einem alphanumerischen Zeichen " "oder einem Unterstrich beginnen" -#: kallithea/model/validators.py:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "Die Eingabe ist nicht gültig" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Ungültiger Benutzergruppenname" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Benutzergruppe \"%(usergroup)s\" existiert bereits" -#: kallithea/model/validators.py:136 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1751,68 +1788,64 @@ "Unterstriche, Punkte oder Bindestriche enthalten und muss mit einem " "alphanumerischen Zeichen beginnen" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Kann diese Gruppe nicht als vorgesetzt setzen" -#: kallithea/model/validators.py:177 +#: 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:179 +#: 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:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Üngültige(nicht ASCII) Zeichen im Passwort" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Ungültiges altes Passwort" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Die Passwörter stimmen nicht überein" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "Ungültiges Passwort" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "Schlüssel stimmt nicht überein" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Repository Name \"%(repo)s\" ist nicht erlaubt" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Es gibt bereits ein Repository mit \"%(repo)s\"" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, 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:333 +#: kallithea/model/validators.py:318 #, 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:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "Ungültige Repository-URL" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -1820,44 +1853,44 @@ "Ungültige Repository-URL. Es muss eine gültige http, https, ssh, svn+http " "oder svn+https URL sein" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 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:460 +#: kallithea/model/validators.py:445 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:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "keine Berechtigung, um ein Repository auf höchster Ebene anzulegen" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 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:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "Dieser Benutzername oder Benutzergruppenname ist nicht gültig" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "Dies ist ein Ungültiger Pfad" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 #, fuzzy msgid "This email address is already in use" msgstr "Diese E-Mailaddresse ist bereits in Benutzung" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "E-MailAddresse \"%(email)s\" existiert nicht." -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1865,11 +1898,11 @@ "Das LDAP-Login-Attribut des CN muss angeben werden - Es ist der Name des " "Attributes äquivalent zu \"Benutzername\"" -#: kallithea/model/validators.py:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Bitte eine gültige IPv4- oder IPv6-Adresse angeben" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" @@ -1877,17 +1910,17 @@ "Die Größe (in Bits) des Netzwerks muss im Bereich 0-32 liegen (nicht " "%(bits)r)" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 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:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "Dateiname darf kein Unterverzeichnis enthalten" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1930,24 +1963,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "Beschreibung" @@ -1964,7 +2003,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1972,11 +2011,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "Besitzer" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "Log In" @@ -1991,7 +2030,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1999,7 +2038,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "Passwort" @@ -2165,10 +2204,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Aktion" @@ -2221,22 +2262,22 @@ msgstr "Plugin" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "Speichern" @@ -2254,14 +2295,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Privates Repository" #: kallithea/templates/admin/defaults/defaults.html:37 #: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2271,36 +2312,25 @@ "sichtbar." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "Aktiviere Statistiken" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "Statistik-Fenster in der Zusammenfassungsseite aktivieren." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "Aktiviere Downloads" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 msgid "Enable download menu on summary page." msgstr "Download-Menü auf der Zusammenfassungsseite aktivieren." -#: 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:78 -msgid "Enable locking" -msgstr "Locking aktivieren" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "Aktivieren Sie Lock-by-Pulling im Repository." - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2349,8 +2379,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 #, fuzzy msgid "Never" msgstr "nie" @@ -2384,7 +2416,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "Neuen Gist erstellen" @@ -2422,23 +2454,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2466,7 +2500,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2526,7 +2560,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "Mein Account" @@ -2539,24 +2573,31 @@ msgid "Email Addresses" msgstr "E-Mail-Adressen" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +#| msgid "API Keys" +msgid "SSH Keys" +msgstr "API Keys" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "API Keys" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 msgid "Owned Repositories" msgstr "Eigene Repositories" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "Beobachtete Repositories" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "Berechtigungen anzeigen" @@ -2583,7 +2624,9 @@ msgstr "Entfernen des API-Schlüssels \"%s\" bestätigen" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "Entfernen" @@ -2599,12 +2642,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "Hinzufügen" @@ -2719,6 +2764,49 @@ msgid "Name" msgstr "Name" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "Nachname" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +#| msgid "Confirm to remove this API key: %s" +msgid "Confirm to remove this SSH key: %s" +msgstr "Entfernen des API-Schlüssels \"%s\" bestätigen" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +#| msgid "New API key" +msgid "New SSH key" +msgstr "Neuer API-Schlüssel" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public Gist" +msgid "Public key" +msgstr "Öffentlicher Gist" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Repositories, denen Sie folgen" @@ -2735,7 +2823,7 @@ msgstr "Global" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "IP Whitelist" @@ -2778,7 +2866,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2956,7 +3044,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "Erweitert" @@ -3068,19 +3156,11 @@ "untergeordneten Elemente, einschließlich nicht-privater Repositories und " "anderer Gruppen, falls ausgewählt." -#: 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 "" -"Aktiviere die Sperre-bei-Pull für die Gruppe. Diese Option wird auf alle " -"anderen enthaltenen Gruppen und Repositories angewandt" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "Diese Gruppe löschen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "Löschen der Gruppe bestätigen" @@ -3110,7 +3190,7 @@ "Repository als Clon von dieser URL erstellt." #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3119,7 +3199,7 @@ "längere Beschreibungen." #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -3131,7 +3211,7 @@ msgstr "Repository Typ der erstellt werden soll." #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Start Revision" @@ -3190,8 +3270,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "Statistiken" @@ -3228,73 +3308,32 @@ "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:42 -msgid "Change Locking" -msgstr "Ändere die Sperrung" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "Entsperren des Repositorys bestätigen." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "Repository entsperren" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "Gesperrt durch %s auf %s" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "Sperren des Repositorys bestätigen." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "Repository sperren" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "Repository ist nicht gesperrt" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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 "" -"Erzwinge die Sperre dieses Repositories. Dies funktioniert nur, falls " -"anonymer Zugang abgeschaltet ist. Ein Pull führt zur Sperre des " -"Repositories. Der pullende Nutzer sperrt das Repository; nur dieser " -"Nutzer kann die Sperre durch eine Push-Operation wieder aufheben." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, 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:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Delete this Repository" msgstr "Dieses Repository löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "Fork abtrennen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "Forks löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3396,19 +3435,13 @@ msgid "This repository does not have a remote repository URL." msgstr "Für dieses Repository ist keine nicht-lokale URL angegeben." -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#, fuzzy +#| msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "Dauerhafte Repository-Kennung" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "Was ist das?" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "URL nach Kennung" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3424,15 +3457,15 @@ "Dies ist insbesondere für CI-Systeme oder in Fällen nützlich, in denen " "die URL des Repositories bei Dritten dauerhaft eingetragen wird." -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Entferntes Repository" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "Repository URL" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3440,16 +3473,16 @@ "Optional: URL eines entfernten Repositories. Falls gesetzt, dann kann das " "Repository von dieser URL bezogen werden." -#: kallithea/templates/admin/repos/repo_edit_settings.html:38 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Standardrevision für Dateiseite, Downloads, Whoosh und Readme" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "Typname des Benutzers" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "Besitzer des Repositorys ändern." @@ -3561,8 +3594,8 @@ "einstellen, wird das Captcha bei der Registrierung aktiviert." #: 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "Einstellungen speichern" @@ -3579,9 +3612,9 @@ "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -"Mit Hilfe von Hooks können bei bestimmten Ereignissen, wie z.B. Push / Pull, " -"Aktionen ausgelöst werden. Sie können Python-Funktionen oder externe " -"Anwendungen auslösen." +"Mit Hilfe von Hooks können bei bestimmten Ereignissen, wie z.B. Push / " +"Pull, Aktionen ausgelöst werden. Sie können Python-Funktionen oder " +"externe Anwendungen auslösen." #: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" @@ -3603,8 +3636,8 @@ "related to repositories that no longer exist in the filesystem." msgstr "" "Aktivieren Sie diese Option, um alle Kommentare, Pull-Requests und andere " -"Datensätze zu entfernen, die sich auf Repositories beziehen, die nicht mehr " -"im Dateisystem vorhanden sind." +"Datensätze zu entfernen, die sich auf Repositories beziehen, die nicht " +"mehr im Dateisystem vorhanden sind." #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" @@ -3626,7 +3659,8 @@ "Current hooks will be updated to the latest version." msgstr "" "Überprüfen Sie, ob die Git-Hooks von Kallithea für jedes Repository " -"installiert sind. Aktuelle Hooks werden auf die neueste Version aktualisiert." +"installiert sind. Aktuelle Hooks werden auf die neueste Version " +"aktualisiert." #: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" @@ -3638,9 +3672,9 @@ "not seem to come from Kallithea. WARNING: This operation will destroy any " "custom git hooks you may have deployed by hand!" msgstr "" -"Wenn Sie Git-Hooks installieren, überschreiben Sie alle vorhandenen Hooks, " -"auch wenn sie nicht von Kallithea zu kommen scheinen. WARNUNG: Diese " -"Operation zerstört alle benutzerdefinierten Git-Hooks, die Sie " +"Wenn Sie Git-Hooks installieren, überschreiben Sie alle vorhandenen " +"Hooks, auch wenn sie nicht von Kallithea zu kommen scheinen. WARNUNG: " +"Diese Operation zerstört alle benutzerdefinierten Git-Hooks, die Sie " "möglicherweise von Hand bereitgestellt haben!" #: kallithea/templates/admin/settings/settings_mapping.html:41 @@ -3660,8 +3694,8 @@ "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -"Diese Option führt zu einer vollständigen Neuindizierung aller Repositories " -"für eine korrekte Volltextsuche." +"Diese Option führt zu einer vollständigen Neuindizierung aller " +"Repositories für eine korrekte Volltextsuche." #: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" @@ -3675,11 +3709,6 @@ msgid "Kallithea version" msgstr "Kallithea-Version" -#: kallithea/templates/admin/settings/settings_system.html:7 -#, fuzzy -msgid "Check for updates" -msgstr "Auf Updates prüfen" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "Kallithea Konfigurationsdatei" @@ -3700,17 +3729,7 @@ msgid "Git path" msgstr "Git-Pfad" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "Upgrade-Info-Endpunkt" - -#: kallithea/templates/admin/settings/settings_system.html:13 -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:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "Python-Pakete" @@ -3719,43 +3738,35 @@ msgstr "Zeigt die Größe des Repositories nach dem Push an" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "Protokollieren der Push-Befehle der Benutzer" - -#: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "Protokollieren der Pull-Befehle des Benutzers" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Repository nach dem Push aktualisieren (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Mercurial extensions" msgstr "Mercurial-Erweiterungen" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "Erweiterung largefiles aktivieren" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "Erweiterung hgsubversion aktivieren" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" "Erfordert die Installation der hgsubversion-Bibliothek. Ermöglicht das " -"Klonen von entfernten Subversion-Repositories während der Konvertierung zu " -"Mercurial." - -#: kallithea/templates/admin/settings/settings_vcs.html:59 +"Klonen von entfernten Subversion-Repositories während der Konvertierung " +"zu Mercurial." + +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "Location of repositories" msgstr "Ort der Repositories" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect." @@ -3763,14 +3774,14 @@ "Zum Entsperren klicken. Sie müssen Kallithea neu starten, damit diese " "Einstellung wirksam wird." -#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -"Dateisystem-Speicherort, an dem die Repositories gespeichert sind. Nach dem " -"Ändern dieses Wertes sind sowohl ein Neustart als auch ein erneuter Scan des " -"Repository-Ordners erforderlich." +"Dateisystem-Speicherort, an dem die Repositories gespeichert sind. Nach " +"dem Ändern dieses Wertes sind sowohl ein Neustart als auch ein erneuter " +"Scan des Repository-Ordners erforderlich." #: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" @@ -3794,8 +3805,8 @@ msgid "" "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -"Zeigt oder verbirgt eine Versionsnummer von Kallithea, die in der Fußzeile " -"angezeigt wird." +"Zeigt oder verbirgt eine Versionsnummer von Kallithea, die in der " +"Fußzeile angezeigt wird." #: kallithea/templates/admin/settings/settings_visual.html:25 msgid "Show user Gravatars" @@ -3821,23 +3832,40 @@ "verwenden.\n" " Die folgenden " "Variablen der URL werden entsprechend ersetzt.\n" -" {scheme} 'http' " -"oder'https', die vom laufenden Kallithea-Server gesendet werden,\n" +" {scheme} " +"'http' oder'https', die vom laufenden Kallithea-Server gesendet werden,\n" " {email} " "Benutzer-E-Mail,\n" -" {md5email} md5 Hash " -"der Benutzer-E-Mail (wie bei gravatar.com),\n" -" {size} Größe " -"des Bildes, das von der Serveranwendung erwartet wird,\n" +" {md5email} md5 " +"Hash der Benutzer-E-Mail (wie bei gravatar.com),\n" +" {size} " +"Größe des Bildes, das von der Serveranwendung erwartet wird,\n" " {netloc} " "Netzwerkstandort/Server-Host des laufenden Kallithea-Servers" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +#, fuzzy +#| msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "Clone-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 construct clone-by-id" msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" "{repo}'.\n" @@ -3852,70 +3880,89 @@ " {repo} full " "repository name,\n" " {repoid} ID of " -"repository, can be used to construct clone-by-id" -msgstr "" -"Schema der Klon-URL-Konstruktion z.B. '{scheme}://{user}@{netloc}/{repo}'.\n" -" Die folgenden Variablen " -"stehen zur Verfügung:\n" +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" +"Schema der Klon-URL-Konstruktion z.B. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" Die folgenden " +"Variablen stehen zur Verfügung:\n" " {scheme}'http' " "oder'https', die vom laufenden Kallithea-Server gesendet werden,\n" " {user} aktueller " "Benutzername des Benutzers,\n" " {netloc} " "Netzwerkstandort/Server-Host des laufenden Kallithea-Servers,\n" -" {repo} vollständiger " -"Name des Repositories,\n" +" {repo} " +"vollständiger Name des Repositories,\n" " {repoid} ID des " "Repositorys, kann verwendet werden, um einen Klon nach Id zu erstellen" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +#| msgid "Clone URL" +msgid "SSH Clone URL" +msgstr "Clone-URL" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repository Size" msgid "Repository page size" msgstr "Repository Größe" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -"Anzahl der Elemente, die auf den Repository-Seiten angezeigt werden, bevor " -"der Seitenumbruch angezeigt wird." - -#: kallithea/templates/admin/settings/settings_visual.html:62 +"Anzahl der Elemente, die auf den Repository-Seiten angezeigt werden, " +"bevor der Seitenumbruch angezeigt wird." + +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "Größe der Admin-Seite" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -"Anzahl der Elemente, die in den Gittern der Admin-Seiten angezeigt werden, " -"bevor der Seitenumbruch angezeigt wird." - -#: kallithea/templates/admin/settings/settings_visual.html:70 +"Anzahl der Elemente, die in den Gittern der Admin-Seiten angezeigt " +"werden, bevor der Seitenumbruch angezeigt wird." + +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "Icons" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "Öffentliches Repository-Symbol in Repositories anzeigen" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "Privates Repository-Symbol in Repositories anzeigen" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." -msgstr "Zeigt öffentliche/private Symbole neben den Namen der Repositories an." - -#: kallithea/templates/admin/settings/settings_visual.html:89 +msgstr "" +"Zeigt öffentliche/private Symbole neben den Namen der Repositories an." + +#: kallithea/templates/admin/settings/settings_visual.html:100 #, fuzzy msgid "Meta Tagging" msgstr "Einstellungen" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." @@ -3923,7 +3970,7 @@ "Analysiert Meta-Tags aus dem Beschreibungsfeld des Repositorys und " "verwandelt sie in farbige Tags." -#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "Erkannte Meta-Tags stilisieren:" @@ -4085,12 +4132,12 @@ msgstr "Support" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Mercurial Repository" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Git Repository" @@ -4138,158 +4185,132 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "Keine Übereinstimmungen gefunden" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "Öffentliches Logbuch" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" -msgstr "Öffentliches Logbuch" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" +msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Meine Pull Requests" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "Nicht eingeloggt" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "Passwort vergessen?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "Kein Account?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "Repositorystandards" +msgid "Create repositories" +msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "Standart Rechte" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -5040,7 +5061,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -5052,7 +5073,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -5105,7 +5126,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "Größe" @@ -5235,8 +5256,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -5287,8 +5308,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5601,9 +5622,9 @@ msgid "File names" msgstr "Dateinamen" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -5613,20 +5634,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "Aktiviere" @@ -5635,12 +5656,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "Dateien" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "Mehr anzeigen" @@ -5681,95 +5702,197 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "Clone von" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "Clone-URL" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "Nachname" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "Herunterladen als zip" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "Feed" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "Letzte Änderungen" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "Schnelleinstieg" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "privates Repository" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "Liesmich-Datei von Revision %s:%s" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "%s als %s herunterladen" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Dieses Repository ist von %s am %s gesperrt worden" + +#~ msgid "Repository has been locked" +#~ msgstr "Repository wurde gesperrt" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Repository nicht mehr gesperrt" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Fehler beim Entsperren" + +#~ msgid "Invalid API key" +#~ msgstr "Ungültiger API Key" + +#~ msgid "Token mismatch" +#~ msgstr "Schlüssel stimmt nicht überein" + +#~ msgid "Enable locking" +#~ msgstr "Locking aktivieren" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "Aktivieren Sie Lock-by-Pulling im Repository." + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "" +#~ "Aktiviere die Sperre-bei-Pull für die Gruppe. Diese Option wird auf " +#~ "alle anderen enthaltenen Gruppen und Repositories angewandt" + +#~ msgid "Change Locking" +#~ msgstr "Ändere die Sperrung" + +#~ msgid "Confirm to unlock repository." +#~ msgstr "Entsperren des Repositorys bestätigen." + +#~ msgid "Unlock Repository" +#~ msgstr "Repository entsperren" + +#~ msgid "Locked by %s on %s" +#~ msgstr "Gesperrt durch %s auf %s" + +#~ msgid "Confirm to lock repository." +#~ msgstr "Sperren des Repositorys bestätigen." + +#~ msgid "Lock Repository" +#~ msgstr "Repository sperren" + +#~ msgid "Repository is not locked" +#~ msgstr "Repository ist nicht gesperrt" + +#~ 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 "" +#~ "Erzwinge die Sperre dieses Repositories. Dies funktioniert nur, falls " +#~ "anonymer Zugang abgeschaltet ist. Ein Pull führt zur Sperre des " +#~ "Repositories. Der pullende Nutzer sperrt das Repository; nur dieser " +#~ "Nutzer kann die Sperre durch eine Push-Operation wieder aufheben." + +#~ msgid "What is that?" +#~ msgstr "Was ist das?" + +#~ msgid "URL by id" +#~ msgstr "URL nach Kennung" + +#, fuzzy +#~ msgid "Check for updates" +#~ msgstr "Auf Updates prüfen" + +#~ msgid "Upgrade info endpoint" +#~ msgstr "Upgrade-Info-Endpunkt" + +#~ 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" + +#~ msgid "Log user push commands" +#~ msgstr "Protokollieren der Push-Befehle der Benutzer" + +#~ msgid "Log user pull commands" +#~ msgstr "Protokollieren der Pull-Befehle des Benutzers" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "Repositorystandards" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "Standart Rechte" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "" #~ "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer " @@ -5943,9 +6066,6 @@ #~ msgid "invalid user name" #~ msgstr "Ungültiger Benutzername" -#~ msgid "Your account is disabled" -#~ msgstr "Ihr Account wurde Deaktiviert" - #~ msgid "invalid clone URL" #~ msgstr "ungültige Clone-URL"
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2015 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-06-26 19:00+0000\n" "Last-Translator: THANOS SIOURDAKIS <siourdakisthanos@gmail.com>\n" "Language-Team: Greek <https://hosted.weblate.org/projects/kallithea/" @@ -18,14 +17,14 @@ "X-Generator: Weblate 3.7.1-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Δεν υπάρχουν σετ αλλαγών ακόμα" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,48 +33,48 @@ msgid "None" msgstr "Χωρίς" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(κλειστό)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Εμφάνιση κενού" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Αγνόηση κενού" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Αύξηση του diff πλαισίου σε %(num)s γραμμές" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permission to change pull request status" msgid "No permission to change status" msgstr "Χωρίς δικαιώματα αλλαγής της κατάστασης του αιτήματος έλξης" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "Επιτυχής διαγραφή αιτήματος έλξης %s" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "Δεν υπάρχει τέτοια αναθεώρηση για αυτό το αποθετήριο" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, fuzzy, python-format #| msgid "Error creating repository %s" msgid "Could not find other repository %s" msgstr "Βλάβη κατά τη δημιουργία του αποθετηρίου %s" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 #, fuzzy #| msgid "Cannot compare repositories without using common ancestor" msgid "Cannot compare repositories of different types" @@ -83,52 +82,52 @@ "Δεν μπορεί να γίνει σύγκριση αποθετηρίων χωρίς να χρησιμοποιηθεί κοινός " "πρόγονος" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 msgid "Cannot show empty diff" msgstr "" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "" "Δεν μπορεί να γίνει σύγκριση αποθετηρίων χωρίς να χρησιμοποιηθεί κοινός " "πρόγονος" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Χωρίς απόκριση" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Άγνωστο λάθος" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" "Η αίτηση δεν μπόρεσε να ερμηνευτεί από τον εξυπηρετητή λόγω κακής " "διατύπωσης." -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Ανεξουσιοδοτημένη πρόσβαση στον πόρο" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "Δεν έχετε άδεια για να εμφανίσετε αυτή τη σελίδα" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Ο πόρος δεν μπορεί να βρεθεί" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -136,12 +135,12 @@ "Ο εξυπηρετητής συνάντησε μια απρόσμενη κατάσταση που τον απέτρεψαν να " "πραγματοποιήσει την αίτηση." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s συνέβαλε στο %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -151,128 +150,122 @@ msgid "Changeset was too big and was cut off..." msgstr "Το σετ αλλαγών ήταν πολύ μεγάλο και περικόπηκε..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s %s τροφοδοσία" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Αλλαγές στο αποθετήριο %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Κλικ εδώ για προθήκη νέου αρχείου" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Δεν υπάρχουν αρχεία ακόμα. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s την %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Το αποθετήριο κλειδώθηκε από %s την %s" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "" "Μπορείτε να διαγράψετε μόνο αρχεία με αναθεώρηση που βρίσκονται σε έγκυρη " "διακλάδωση" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Διαγραφή αρχείου %s μέσω του Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Επιτυχής διαγραφή αρχείου %s" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Συνέβη λάθος κατά το commit" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" "Μπορείτε να επεξεργαστείτε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε " "έγκυρη διακλάδωση" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Επεξεργασία αρχείου %s μέσω του Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Καμία αλλαγή" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Επιτυχής παράδοση σε %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Προσθήκη αρχείου μέσω Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Χωρίς περιεχόμενο" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Χωρίς όνομα αρχείου" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Η τοποθεσία πρέπει να είναι σχετική διαδρομή και να μην περιέχει .. μέσα " "της" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Οι μεταφορτώσεις απενεργοποιήθηκαν" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Άγνωστη αναθεώρηση %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Άδειο αποθετήριο" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Άγνωστος τύπος αρχειοθέτησης" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Σετ αλλαγών" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Κλάδοι" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Ετικέτες" @@ -281,11 +274,11 @@ msgid "An error occurred during repository forking %s" msgstr "Συνέβει ένα λάθος κατά την διακλάδωση του αποθετηρίου %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Ομάδες" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -293,186 +286,186 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Αποθετήρια" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Κλάδος" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Κλειστοί Κλάδοι" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Ετικέτα" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Σελιδοδείκτης" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Δημόσιο Ημερολόγιο" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Ημερολόγιο" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Λάθος captcha" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Εγγραφήκατε επιτυχώς στο %s" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "Στάλθηκε ένας κωδικός επιβεβαίωσης επαναφοράς του συνθηματικού" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Άκυρο τεκμήριο (token) επαναφοράς του συνθηματικού" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Το συνθηματικό ενημερώθηκε επιτυχώς" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Καθορίστηκε άκυρος σχολιαστής \"%s\"" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (κλειστό)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Σετ αλλαγών" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Ειδικός" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Ομότιμοι κλάδοι" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Λάθος κατά τη δημιουργία αιτήματος έλξης (pull request)" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Δημιουργήθηκε ενημέρωση αιτήματος έλξης" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Χωρίς περιγραφή" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Ενημερώθηκε η αίτηση έλξης" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Επιτυχής διαγραφή αιτήματος έλξης" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, 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:522 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Το αίτημα έλξης έχει ήδη συγχωνευτεί με το %s." -#: kallithea/controllers/pullrequests.py:524 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Αυτό το αίτημα έλξης έχει κλείσει και δεν μπορεί να ενημερωθεί." -#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:541 #, 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:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, 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:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Σημείωση: Ο κλάδος %s έχει άλλη κεφαλή (head): %s." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 #, 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:566 +#: kallithea/controllers/pullrequests.py:564 #, 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:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -488,21 +481,21 @@ msgid "An error occurred during search operation." msgstr "Ένα λάθος συνέβη κατά την διαδικασία αναζήτησης." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Δεν υπάρχουν ακόμα έτοιμα δεδομένα" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Τα στατιστικά είναι απενεργοποιημένα για αυτό το αποθετήριο" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Οι ρυθμίσεις εξουσιοδότησης ενημερώθηκαν επιτυχώς" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "παρουσιάστηκε βλάβη κατά την ενημέρωση των ρυθμίσεων εξουσιοδότησης" @@ -514,125 +507,139 @@ msgid "Error occurred during update of defaults" msgstr "Συνέβη μία βλάβη κατά την ενημέρωση των προεπιλογών" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "Πάντα" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 λεπτά" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 ώρα" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 ημέρα" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 μήνας" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Συνέβη μία βλάβη κατά τη δημιουργία του gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Διαγράφηκε το gist %s" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Mη τροποποιημένo" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Το περιεχόμενο του gist ενημερώθηκε επιτυχώς" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "Τα δεδομένα του gist ενημερώθηκαν επιτυχώς" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "Σφάλμα συνέβη κατά την ενημέρωση του gist %s" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Δεν μπορείτε να επεξεργαστείτε αυτόν το χρήστη καθώς είναι κρίσιμος για " "όλη την εφαρμογή" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Ο λογαριασμός σας ενημερώθηκε επιτυχώς" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Συνέβη ένα σφάλμα κατά την ενημέρωση του χρήστη %s" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Συνέβη ένα σφάλμα κατά την ενημέρωση του κωδικού του χρήστη" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "Προστέθηκε το email %s στον χρήστη" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "Συνέβη ένα σφάλμα κατά την αποθήκευση του email" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "Αφαιρέθηκε το email από τον χρήστη" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "Το API κλειδί δημιουργήθηκε επιτυχώς" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "Το API κλειδί επαναφέρθηκε επιτυχώς" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "Το API κλειδί διαγράφηκε επιτυχώς" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "Το API κλειδί δημιουργήθηκε επιτυχώς" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "Το API κλειδί διαγράφηκε επιτυχώς" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -640,9 +647,9 @@ msgid "Read" msgstr "Ανάγνωση" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -650,9 +657,9 @@ msgid "Write" msgstr "Εγγραφή" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -675,366 +682,351 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Διαχειριστής" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Απενεργοποιημένο" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Επιτρέπεται με χειροποίητη ενεργοποίηση του λογαριασμού" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Επιτρέπεται με αυτόματη ενεργοποίηση του λογαριασμού" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Χειροποίητη ενεργοποίηση εξωτερικού λογαριασμού" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Ενεργό" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "Τα καθολικά δικαιώματα ενημερώθηκαν επιτυχώς" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Συνέβει μια βλάβη κατά την ενημέρωση των δικαιωμάτων" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Συνέβει μια βλάβη κατά την δημιουργία της ομάδας αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Δημιουργήθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Συνέβει μια βλάβη κατά την ενημέρωση της ομάδας αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Αυτή η ομάδα περιέχει %s αποθετήρια και δε μπορεί να διαγραφεί" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Αυτή η ομάδα περιέχει %s υποομάδες και δε μπορεί να διαγραφεί" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Αφαιρέθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Συνέβει μια βλάβη κατά την διαγραφή της ομάδας αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "Δεν μπορείτε να ανακαλέσετε την άδεια σας ως διαχειριστής" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Τα δικαιώματα της ομάδας αποθετηρίου ενημερώθηκαν" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "Συνέβει μια βλάβη κατά την ανάκληση της άδειας" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Βλάβη κατά τη δημιουργία του αποθετηρίου %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Δημιουργήθηκε το αποθετήριο %s από το %s" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Κλωνοποιήθηκε το αποθετηρίο %s ως %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Δημιουργήθηκε το αποθετήριο %s" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Το αποθετήριο %s ενημερώθηκε επιτυχώς" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "Συνέβει μια βλάβη κατά την ενημέρωση του αποθετηρίου %s" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "Αποσυνδέθηκαν %s κλώνοι" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "Διαγράφηκαν %s κλώνοι" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Διαγράφηκε το αποθετήριο %s" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Δε μπορεί να διαγραφεί το αποθετήριο %s που ακόμα έχει κλώνους" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "Συνέβει μια βλάβη κατά την διαγραφή του %s" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Τα δικαιώματα του αποθετηρίου ενημερώθηκαν" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Συνέβει μια βλάβη κατά την απομάκρυνση του πεδίου" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Όχι κλώνος --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Ενημερώθηκε η ορατότητα του αποθετηρίου στο δημόσιο ημερολόγιο" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" "Συνέβει μια βλάβη κατά την τοποθέτηση αυτού το αποθετηρίου στο δημόσιο " "ημερολόγιο" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Χωρίς" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Σημειώθηκε το αποθετήριο %s σαν κλώνος του %s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Παρουσιάστηκε ένα σφάλμα κατά τη διάρκεια αυτής της λειτουργίας" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Το αποθετήριο έχει κλειδωθεί" - -#: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Το αποθετήριο έχει ξεκλειδωθεί" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Παρουσιάστηκε ένα σφάλμα κατά το ξεκλείδωμα" - -#: kallithea/controllers/admin/repos.py:528 +#: kallithea/controllers/admin/repos.py:490 msgid "Cache invalidation successful" msgstr "Η ακύρωση της cache ήταν επιτυχής" -#: kallithea/controllers/admin/repos.py:532 +#: kallithea/controllers/admin/repos.py:494 msgid "An error occurred during cache invalidation" msgstr "Παρουσιάστηκε ένα σφάλμα κατά τη διάρκεια ακύρωσης της cache" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format #| msgid "Deleted repository %s" msgid "Invalidated %s repositories" msgstr "Διαγράφηκε το αποθετήριο %s" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Δεν υπάρχουν ακόμα έτοιμα δεδομένα" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1064,218 +1056,218 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1283,69 +1275,96 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "" @@ -1354,133 +1373,133 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1506,79 +1525,79 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| msgid "Error creating pull request: %s" msgid "Cannot create empty pull request" msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 #, fuzzy #| msgid "Missing changesets since the previous pull request:" msgid "Missing changesets since the previous iteration:" msgstr "Ελλιπή σετ αλλαγών από την προηγούμενη αίτηση έλξης:" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, 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 +#: kallithea/model/pull_request.py:353 #, 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 +#: kallithea/model/pull_request.py:360 #, fuzzy, python-format #| msgid "" #| "This pull request is based on another %s revision and there is no " @@ -1590,232 +1609,243 @@ "Αυτή η αίτηση έλξης είναι βασισμένη σε μία άλλη %s αναθεώρηση και δεν " "υπάρχει ένα απλό diff." -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, 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 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, python-format +msgid "SSH key %r not found" +msgstr "" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1856,24 +1886,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1890,7 +1926,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1898,11 +1934,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1917,7 +1953,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1925,7 +1961,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -2081,10 +2117,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2133,22 +2171,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2166,14 +2204,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2181,36 +2219,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2257,8 +2284,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2291,7 +2320,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2327,23 +2356,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2371,7 +2402,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2431,7 +2462,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2444,24 +2475,29 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 -msgid "API Keys" -msgstr "" - #: kallithea/templates/admin/my_account/my_account.html:29 -msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:30 -#: kallithea/templates/journal/journal.html:33 -msgid "Watched Repositories" +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:32 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:33 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2488,7 +2524,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2504,12 +2542,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2610,6 +2650,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" @@ -2626,7 +2702,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2662,7 +2738,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2822,7 +2898,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2932,17 +3008,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2971,14 +3041,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2988,7 +3058,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -3040,8 +3110,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -3075,69 +3145,32 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3236,19 +3269,11 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "Permanent URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3258,30 +3283,30 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3390,8 +3415,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "" @@ -3486,10 +3511,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3510,15 +3531,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3527,46 +3540,38 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3615,8 +3620,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3634,58 +3638,73 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repositories" msgid "Repository page size" msgstr "Αποθετήρια" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3846,12 +3865,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3899,151 +3918,128 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" +msgid "Create repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -msgid "default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4768,7 +4764,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4780,7 +4776,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4833,7 +4829,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4961,8 +4957,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -5013,8 +5009,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5320,9 +5316,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5332,20 +5328,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5354,12 +5350,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5400,94 +5396,110 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" +msgid "Add or upload files directly via Kallithea" msgstr "" #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Το αποθετήριο κλειδώθηκε από %s την %s" + +#~ msgid "Repository has been locked" +#~ msgstr "Το αποθετήριο έχει κλειδωθεί" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Το αποθετήριο έχει ξεκλειδωθεί" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Παρουσιάστηκε ένα σφάλμα κατά το ξεκλείδωμα" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "" #~ "Δεν υπάρχει ευρετήριο για την αναζήτηση. Παρακαλώ τρέξτε τον whoosh "
--- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2016 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2018-04-18 11:43+0000\n" "Last-Translator: Jesús Sánchez <jsanchezfdz95@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/kallithea/" @@ -18,14 +17,14 @@ "X-Generator: Weblate 3.0-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Aún no hay cambios" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,94 +33,94 @@ msgid "None" msgstr "Ninguno" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(cerrado)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Mostrar espacios en blanco" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorar espacios en blanco" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Aumentar el contexto del diff a %(num)s lineas" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permission to change pull request status" msgid "No permission to change status" msgstr "No tene permiso para cambiar el estado de la petición pull" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "Petición de pull %s eliminada correctamente" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "La revisión no existe en este repositorio" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "No se puede encontrar otro repositorio %s" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "No se pueden comparar repositorios de diferentes tipos" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "No se puede mostrar diff vacio" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "No se puede mostrar diff vacio" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 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 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "No hay respuesta" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Error desconocido" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 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:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Acceso no autorizado al recurso" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "No tiene permiso para ver esta página" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "No se ha encontrado el recurso" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -129,12 +128,12 @@ "La petición no se ha podido completar debido a que el servidor encontró " "un problema inesperado." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s anotó en %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -144,124 +143,118 @@ msgid "Changeset was too big and was cut off..." msgstr "El cambio era demasiado grande y se redució..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s%s canal" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, fuzzy, python-format msgid "Changes on %s repository" msgstr "Cambios en %s repositorio" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Haga clic aquí para añadir un archivo nuevo" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Aún no hay archivos. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s en %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, 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:311 +#: kallithea/controllers/files.py:296 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:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Archivo %s eliminado mediante Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "El archivo %s se eliminó correctamente" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Ocurrió un error al anotar los cambios" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 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:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Archivo %s editado mediante Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "No hay cambios" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Anotado correctamente a %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Archivo añadido mediante Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Sin contenido" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Sin nombre de archivo" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 #, 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:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Descargas deshabilitadas" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Revisión desconocida %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Repositorio vacío" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Tipo de archivo desconocido" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Cambios" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Ramas" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Etiquetas" @@ -270,11 +263,11 @@ msgid "An error occurred during repository forking %s" msgstr "Ocurrió un error mientras se bifurcaba el repositorio %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Grupos" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -282,187 +275,187 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repositorios" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Rama" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Ramas cerradas" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Etiqueta" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Marcador" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Registro público" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Registro" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "CAPTCHA erróneo" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "El registro en %s se ha efectuado correctamente" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 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:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Señal de restauración de contraseña inválida" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Contraseña actualizada correctamente" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "El validador \"%s\" no es correcto" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (cerrado)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Cambio" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 #, fuzzy msgid "Peer branches" msgstr "Ramas de los pares" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Error al crear la petición de pull: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Ocurrió un error al crear la petición de pull" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "La petición de pull se ha creado correctamente" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, 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:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "No hay descripción" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Petición pull actualizada" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Petición pull eliminada correctamente" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, 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:522 +#: kallithea/controllers/pullrequests.py:520 #, 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:524 +#: kallithea/controllers/pullrequests.py:522 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:543 +#: kallithea/controllers/pullrequests.py:541 #, 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:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, 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:557 +#: kallithea/controllers/pullrequests.py:555 #, fuzzy, python-format msgid "Note: Branch %s has another head: %s." msgstr "Nota: la rama %s tiene otro head: %s." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 #, 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:566 +#: kallithea/controllers/pullrequests.py:564 #, 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:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -478,21 +471,21 @@ msgid "An error occurred during search operation." msgstr "Ocurrió un error mientras se ejecutaba la búsqueda." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Todavía no hay datos disponibles" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Las estadísticas están deshabilitadas en este repositorio" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Los ajustes de autentificación se han actualizado correctamente" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "ocurrió un error al actualizar los ajustes de autentificación" @@ -504,123 +497,136 @@ 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:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "Para siempre" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 minutos" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 hora" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 día" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 mes" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Ocurrió un error mientras se creaba el gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Gist %s eliminado" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Sin modificar" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Gist actualizado correctamente" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "Successfully deleted file %s" +msgid "SSH key successfully deleted" +msgstr "El archivo %s se eliminó correctamente" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -628,9 +634,9 @@ msgid "Read" msgstr "" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -638,9 +644,9 @@ msgid "Write" msgstr "" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -663,363 +669,348 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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:42 -#: kallithea/templates/base/root.html:50 -msgid "Disabled" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 -msgid "Allowed with manual account activation" +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" msgstr "" #: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:466 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:468 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Todavía no hay datos disponibles" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1049,218 +1040,218 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1268,69 +1259,96 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "" @@ -1339,133 +1357,133 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1491,79 +1509,79 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| 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 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 #, 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 +#: kallithea/model/pull_request.py:346 #, 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 +#: kallithea/model/pull_request.py:353 #, 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 +#: kallithea/model/pull_request.py:360 #, fuzzy, python-format msgid "" "This iteration is based on another %s revision and there is no simple " @@ -1572,232 +1590,243 @@ "La petición de pull está basada en otra %s revisión y no hay un diff " "simple." -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, 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 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, python-format +msgid "SSH key %r not found" +msgstr "" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1838,24 +1867,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1872,7 +1907,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1880,11 +1915,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1899,7 +1934,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1907,7 +1942,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -2063,10 +2098,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2115,22 +2152,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2148,14 +2185,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2163,36 +2200,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2239,8 +2265,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2273,7 +2301,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2309,23 +2337,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2353,7 +2383,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2413,7 +2443,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2426,24 +2456,29 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 -msgid "API Keys" -msgstr "" - #: kallithea/templates/admin/my_account/my_account.html:29 -msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:30 -#: kallithea/templates/journal/journal.html:33 -msgid "Watched Repositories" +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:32 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:33 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2470,7 +2505,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2486,12 +2523,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2592,6 +2631,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" @@ -2608,7 +2683,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2644,7 +2719,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2804,7 +2879,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2912,17 +2987,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2950,14 +3019,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2967,7 +3036,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -3019,8 +3088,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -3054,69 +3123,32 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3215,19 +3247,11 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "Permanent URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3237,30 +3261,30 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3369,8 +3393,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "" @@ -3465,10 +3489,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3489,15 +3509,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3506,46 +3518,38 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3594,8 +3598,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3613,58 +3616,73 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repositories" msgid "Repository page size" msgstr "Repositorios" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3825,12 +3843,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3878,151 +3896,128 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" +msgid "Create repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -msgid "default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4744,7 +4739,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4756,7 +4751,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4808,7 +4803,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4936,8 +4931,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -4988,8 +4983,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5295,9 +5290,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5307,20 +5302,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5329,12 +5324,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5375,94 +5370,101 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" +msgid "Add or upload files directly via Kallithea" msgstr "" #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Este repositorio ha sido bloqueado por %s en %s" + #~ 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 "
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,15 +1,14 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-05-06 08:48+0000\n" "Last-Translator: Étienne Gilli <etienne.gilli@gmail.com>\n" -"Language-Team: French <https://hosted.weblate.org/projects/kallithea/stable/" -"fr/>\n" +"Language-Team: French <https://hosted.weblate.org/projects/kallithea/" +"stable/fr/>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,14 +17,14 @@ "X-Generator: Weblate 3.7-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,92 +33,92 @@ msgid "None" msgstr "Aucun" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(fermé)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Afficher les espaces et tabulations" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorer les espaces et tabulations" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Augmenter le contexte du diff à %(num)s lignes" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 msgid "No permission to change status" msgstr "Permission manquante pour changer le statut" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "La requête de pull %s a été supprimée avec succès" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 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:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "Impossible de trouver l'autre dépôt %s" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "Impossible de comparer des dépôts de types différents" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 msgid "Cannot show empty diff" msgstr "Impossible d'afficher un diff vide" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "Aucun ancêtre trouvé pour le diff de fusion" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "Plusieurs ancêtres de fusion trouvés pour la comparaison de fusion" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 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 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Pas de réponse" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Erreur inconnue" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 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:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Accès interdit à cette ressource" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 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:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Ressource introuvable" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -127,12 +126,12 @@ "La requête n’a pu être traitée en raison d’une erreur survenue sur le " "serveur." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s a commité, le %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -142,125 +141,119 @@ 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:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "Flux %s de %s" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Changements sur le dépôt %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Ajouter un nouveau fichier" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 msgid "There are no files yet." msgstr "Il n'y a pas encore de fichier." -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s à %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, 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:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "" "Vous ne pouvez supprimer les fichiers que si la révision est une branche " "valide" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Le fichier %s a été supprimé via Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Suppression du fichier %s effectuée avec succès" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" "Vous ne pouvez modifier les fichiers que si la révision est une branche " "valide" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "%s édité via Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Aucun changement" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "%s ajouté par Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Aucun contenu" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Aucun nom de fichier" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 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:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Dépôt vide" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Tags" @@ -269,11 +262,11 @@ 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:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Groupes" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -281,176 +274,176 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Dépôts" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Branche" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Branches fermées" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Étiquette" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Signet" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Journal public" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Historique" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Mauvais captcha" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Vous vous êtes inscrit avec succès avec %s" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 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:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Clé de réinitialisation de mot de passe invalide" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Mot de passe mis à jour avec succès" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Reviewer spécifié \"%s\" non valide" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (fermé)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Changements" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Spécial" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Branches appairées" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Signets" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Erreur de création de la demande de pull : %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Une erreur est survenue durant la création de la pull request" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "Nouvelle itération de requête de pull créée" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "Entretemps, les relecteurs suivants on été ajoutés : %s" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "Entretemps, les relecteurs suivants ont été supprimés : %s" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Aucune description" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Pull request mise à jour" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "Révision %s non trouvée dans %s" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" "Erreur : Pas de changeset trouvé lors de l'affichage la requête de pull " "de %s." -#: kallithea/controllers/pullrequests.py:522 +#: kallithea/controllers/pullrequests.py:520 #, 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:524 +#: kallithea/controllers/pullrequests.py:522 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:543 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "" "Les modifications additionnelles suivantes sont disponibles sur %s :" -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "Pas de changeset additionnel trouvé pour cette requête de pull." -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, 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:564 +#: kallithea/controllers/pullrequests.py:562 msgid "Git pull requests don't support iterating yet." msgstr "" "Les itérations des requêtes de pull Git ne sont pas encore supportées." -#: kallithea/controllers/pullrequests.py:566 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." @@ -458,7 +451,7 @@ "Erreur : certains changesets n'ont pas été trouvés lors de l'affichage la " "requête de pull depuis %s." -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" "Le diff ne peut pas être affiché : révisions des requêtes de pull " @@ -476,21 +469,21 @@ msgid "An error occurred during search operation." msgstr "Une erreur est survenue pendant la recherche." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Aucune donnée actuellement disponible" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Mise à jour des paramètres d'authentification effectuée avec succès" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" "une erreur est survenue pendant la mise à jour des réglages " @@ -505,127 +498,141 @@ 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:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "Pour toujours" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 minute" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 heure" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 jour" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 mois" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Une erreur est survenue lors de la création du gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Gist %s supprimé" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Non modifié" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Le contenu du gist a été mis à jour avec succès" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "Les données du gist on été mises à jour avec succès" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, 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:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 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:117 +#: 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:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, 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:166 +#: 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:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 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:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "Clé d'API créée avec succès" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "Clé d'API remise à zéro avec succès" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "Clé d'API supprimée avec succès" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "Clé d'API créée avec succès" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "Clé d'API supprimée avec succès" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -633,9 +640,9 @@ msgid "Read" msgstr "Lire" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -643,9 +650,9 @@ msgid "Write" msgstr "Écrire" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -668,258 +675,243 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administration" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Interdite" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Autorisé avec activation de compte manuelle" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Autorisé avec activation de compte automatique" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Activation manuelle du compte externe" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Autorisée" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "Permissions globales mises à jour avec succès" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Une erreur est survenue durant la mise à jour des permissions" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, 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:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Groupe de dépôts %s créé" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Groupe de dépôts %s mis à jour" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, 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:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, 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:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, 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:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Groupe de dépôts %s supprimé" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, 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:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "Impossible de révoquer votre permission d'administrateur" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 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:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Erreur de création du dépôt %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Dépôt %s créé depuis %s" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Dépôt %s créé" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, 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:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "%s forks détachés" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "%s forks supprimés" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Dépôt %s supprimé" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, 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:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Permissions du dépôt mises à jour" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "Erreur de validation du champ : %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Une erreur est survenue durant la création du champ : %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Une erreur est survenue durant la suppression du champ" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Pas un fork --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 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:450 +#: kallithea/controllers/admin/repos.py:452 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:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "[Aucun dépôt]" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, 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:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Ce dépôt a été verrouillé" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "Invalidation du cache réalisée avec succès" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Ce dépôt a été déverrouillé" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Une erreur est survenue durant le déverrouillage" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "Invalidation du cache réalisée avec succès" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 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:579 +#: kallithea/controllers/admin/repos.py:541 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:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -927,117 +919,117 @@ "Impossible d'activer la prise en charge de hgsubversion. La bibliothèque " "« hgsubversion » est manquante" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 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:180 +#: kallithea/controllers/admin/settings.py:176 #, 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:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "%s dépôts invalidés" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour" -#: kallithea/controllers/admin/settings.py:291 +#: 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:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Veuillez entrer votre adresse e-mail" -#: kallithea/controllers/admin/settings.py:330 +#: 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:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "Le hook existe déjà" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" "Les hooks intégrés sont en lecture seule. Merci de choisir un autre nom " "pour le hook." -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Groupe d'utilisateurs %s créé" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, 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:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Groupe d'utilisateurs %s mis à jour" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, 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:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "Groupe d'utilisateurs supprimé avec succès" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 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:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "Le groupe cible ne peut pas être le même" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "Permissions du groupe d'utilisateurs mises à jour" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "Permissions mises à jour" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions" @@ -1067,223 +1059,225 @@ msgid "The default user cannot be edited" msgstr "L'utilisateur par défaut ne peut pas être modifié" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, 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:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "Une erreur est survenue durant la sauvegarde d'IP" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "L'adresse IP a été supprimée de la liste blanche" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 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:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "Clé d'API invalide" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 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 " "sont considérés comme expirés" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "Dépôt non trouvé sur le système de fichiers" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "Ensemble de changements pour %s %s non trouvé dans %s" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "Votre compte est désactivé" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Fichier binaire" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 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:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "Aucun changement détecté" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "Branche supprimée : %s" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "Étiquette créée : %s" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "Ensemble de changements %s non trouvé" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "Vue de comparaison" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "et" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "%s de plus" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "révisions" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "Nom du fork %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "Requête de pull %s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "[téléchargée] archive depuis le dépôt" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "[créé] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "[mis à jour] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[a pushé] dans" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[a commité via Kallithea] dans le dépôt" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " et %s de plus" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Aucun fichier" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "nouveau fichier" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "suppr." -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "renommer" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1294,69 +1288,96 @@ "probablement été créé ou renommé manuellement. Veuillez relancer " "l’application pour rescanner les dépôts" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "dans %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "dans %s et %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "à l’instant" @@ -1365,158 +1386,158 @@ msgid "on line %s" msgstr "à la ligne %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "niveau supérieur" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Administrateur Kallithea" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 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:1706 +#: kallithea/model/db.py:1640 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:1707 +#: kallithea/model/db.py:1641 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:1708 +#: kallithea/model/db.py:1642 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:1710 +#: kallithea/model/db.py:1644 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:1711 +#: kallithea/model/db.py:1645 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:1712 +#: kallithea/model/db.py:1646 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:1713 +#: kallithea/model/db.py:1647 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:1715 +#: kallithea/model/db.py:1649 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:1716 +#: kallithea/model/db.py:1650 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:1717 +#: kallithea/model/db.py:1651 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:1718 +#: kallithea/model/db.py:1652 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:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "Seul un administrateur peut créer un groupe de dépôts" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 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:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "Seul un administrateur peut créer des groupes d'utilisateurs" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" "Les utilisateurs non-administrateurs peuvent créer des groupes " "d'utilisateurs" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 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:1727 +#: kallithea/model/db.py:1661 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:1729 +#: kallithea/model/db.py:1663 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/model/db.py:1730 +#: kallithea/model/db.py:1664 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/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "Seul un administrateur peut faire un fork de dépôt" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "Les utilisateurs non-administrateurs peuvent faire un fork de dépôt" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "Enregistrement désactivé" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" "Enregistrement des utilisateurs avec activation de compte automatique" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "Pas encore relue" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "En cours de relecture" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "Non approuvée" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Approuvée" @@ -1542,7 +1563,7 @@ msgid "Name must not contain only digits" msgstr "Le nom ne doit pas contenir seulement des chiffres" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " @@ -1551,12 +1572,12 @@ "[Commentaire] Changeset %(short_id)s « %(message_short)s » de " "%(repo_name)s dans %(branch)s" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "Nouvel utilisateur %(new_username)s enregistré" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, python-format msgid "" "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " @@ -1565,7 +1586,7 @@ "[Revue] %(repo_name)s PR %(pr_nice_id)s « %(pr_title_short)s » depuis " "%(pr_source_branch)s par %(pr_owner_username)s" -#: kallithea/model/notification.py:171 +#: kallithea/model/notification.py:170 #, python-format msgid "" "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " @@ -1574,11 +1595,11 @@ "[Commentaire] %(repo_name)s PR %(pr_nice_id)s « %(pr_title_short)s » " "depuis %(pr_source_branch)s par %(pr_owner_username)s" -#: kallithea/model/notification.py:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "Fermeture" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" @@ -1586,11 +1607,11 @@ "%(user)s veut que vous regardiez la demande de pull %(pr_nice_id)s : " "%(pr_title)s" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "Impossible de créer une requête de pull vide" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, python-format msgid "" "Cannot create pull request - criss cross merge detected, please merge a " @@ -1599,24 +1620,24 @@ "Impossible de créer la requête de pull : fusion croisée détectée, merci " "de fusionner une révision plus vieille de %s vers %s" -#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "Vous n'êtes pas autorisé à créer cette requête de pull" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "Changeset manquant depuis la précédente itération :" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "Nouveau changeset sur %s %s depuis la précédente itération :" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "L'ancêtre n'a pas changé - diff depuis l'itération précédente :" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " @@ -1625,32 +1646,48 @@ "Cette itération est basée sur une autre révision %s et il n'y a pas de " "diff simple." -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "Aucun changement constaté sur %s %s depuis l'itération précédente." -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "Fermé, itération suivante : %s." -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "Dernier sommet" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Changeset %s not found" +msgid "SSH key %r not found" +msgstr "Ensemble de changements %s non trouvé" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "Nouveau enregistrement d'utilisateur" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 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:258 +#: kallithea/model/user.py:255 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1659,7 +1696,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:263 +#: kallithea/model/user.py:260 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " @@ -1668,7 +1705,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:270 +#: kallithea/model/user.py:267 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1678,15 +1715,15 @@ "être supprimé. Changez les propriétaires de ces groupes d'utilisateurs ou " "supprimez-les : %s" -#: kallithea/model/user.py:364 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "Lien de remise à zéro du mot de passe" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "Notification de réinitialisation du mot de passe" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, python-format msgid "" "The password to your account %s has been changed using password reset " @@ -1695,21 +1732,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:54 kallithea/model/validators.py:55 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "Cette valeur ne peut être une liste vide" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Le nom d’utilisateur « %(username)s » existe déjà" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 msgid "" "Username may only contain alphanumeric characters underscores, periods or " "dashes and must begin with an alphanumeric character or underscore" @@ -1718,25 +1755,25 @@ "des underscores (_), points, traits d'union et doit commencer avec un " "caractère alphanumérique ou un underscore" -#: kallithea/model/validators.py:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "L'entrée n'est pas valide" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Nom de groupe d'utilisateurs invalide" -#: kallithea/model/validators.py:134 +#: 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:136 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1745,65 +1782,61 @@ "alphanumériques, des tirets, des points, des traits d'union et doit " "commencer avec un caractère alphanumérique" -#: kallithea/model/validators.py:176 +#: 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:177 +#: 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:179 +#: 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:235 +#: 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:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Ancien mot de passe invalide" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "Nom d'utilisateur ou mot de passe invalide" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "Jeton d’authentification incorrect" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, 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:330 +#: kallithea/model/validators.py:315 #, 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:331 +#: kallithea/model/validators.py:316 #, 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:333 +#: kallithea/model/validators.py:318 #, 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:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "URL de dépôt invalide" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -1811,42 +1844,42 @@ "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:445 +#: kallithea/model/validators.py:430 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:460 +#: kallithea/model/validators.py:445 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:462 +#: kallithea/model/validators.py:447 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:512 +#: kallithea/model/validators.py:497 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:552 +#: kallithea/model/validators.py:537 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:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "Cette adresse e-mail est déjà enregistrée" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1854,28 +1887,28 @@ "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom " "d’utilisateur" -#: kallithea/model/validators.py:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Veuillez entrer une adresse IPv4 ou IPv6 valide" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, 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:765 +#: kallithea/model/validators.py:750 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:779 +#: kallithea/model/validators.py:764 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:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1919,24 +1952,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "Description" @@ -1953,7 +1992,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1961,11 +2000,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "Propriétaire" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "Connexion" @@ -1980,7 +2019,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1988,7 +2027,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "Mot de passe" @@ -2152,10 +2191,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Action" @@ -2207,22 +2248,22 @@ msgstr "Greffon" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "Enregistrer" @@ -2240,14 +2281,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Dépôt privé" #: kallithea/templates/admin/defaults/defaults.html:37 #: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2257,36 +2298,25 @@ "comme collaborateurs." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "Activer les statistiques" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "Activer les téléchargements" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:58 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 -#: kallithea/templates/admin/repos/repo_edit_settings.html:78 -msgid "Enable locking" -msgstr "Activer le verrouillage" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "Activer le verrouillage lors d’un pull sur le dépôt." - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2335,8 +2365,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "Jamais" @@ -2369,7 +2401,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "Créer un nouveau gist" @@ -2405,23 +2437,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2449,7 +2483,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2509,7 +2543,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "Mon compte" @@ -2522,24 +2556,31 @@ msgid "Email Addresses" msgstr "Adresses e-mail" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +#| msgid "API Keys" +msgid "SSH Keys" +msgstr "Clés de l'API" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "Clés de l'API" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 msgid "Owned Repositories" msgstr "Dépôts possédés" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "Dépôts surveillés" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "Afficher les permissions" @@ -2566,7 +2607,9 @@ msgstr "Confirmer la suppression de cette clé d'API : %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "Supprimer" @@ -2582,12 +2625,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "Ajouter" @@ -2699,6 +2744,49 @@ msgid "Name" msgstr "Nom" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "Nom" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +#| msgid "Confirm to remove this API key: %s" +msgid "Confirm to remove this SSH key: %s" +msgstr "Confirmer la suppression de cette clé d'API : %s" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +#| msgid "New API key" +msgid "New SSH key" +msgstr "Nouvelle clé d'API" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public Gist" +msgid "Public key" +msgstr "Gist public" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Dépôts que vous surveillez" @@ -2715,7 +2803,7 @@ msgstr "Global" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "Liste blanche d'adresses IP" @@ -2756,7 +2844,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2938,7 +3026,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "Avancé" @@ -3046,19 +3134,11 @@ "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:29 -msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" -msgstr "" -"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:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "Supprimer ce groupe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "Confirmer la suppression de ce groupe" @@ -3088,7 +3168,7 @@ "comme un clone à partir de cette URL." #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3097,7 +3177,7 @@ "pour des descriptions plus détaillées." #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." @@ -3107,7 +3187,7 @@ msgstr "Type de dépôt à créer." #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Révision d’arrivée" @@ -3166,8 +3246,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "Statistiques" @@ -3204,73 +3284,32 @@ "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:42 -msgid "Change Locking" -msgstr "Changer le verrouillage" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "Veuillez confirmer le déverrouillage de ce dépôt." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "Déverrouiller le dépôt" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "Verrouillé par %s sur %s" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "Veuillez confirmer le verrouillage de ce dépôt." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "Verrouiller le dépôt" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "Ce dépôt n’est pas verrouillé" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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 "" -"Forcer le verrouillage du dépôt. Ne fonctionne que lorsque l'accès " -"anonyme est désactivé. Déclencher un pull verrouille le dépôt. " -"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:72 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, 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:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Delete this Repository" msgstr "Supprimer ce dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "Détacher les forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "Supprimer les forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3373,19 +3412,13 @@ 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:7 -msgid "Permanent Repository ID" +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#, fuzzy +#| msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "ID permanent du dépôt" -#: 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:9 -msgid "URL by id" -msgstr "URL par id" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3402,15 +3435,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:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "URL du dépôt" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3418,18 +3451,18 @@ "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:38 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 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:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "Saisir le nom de l'utilisateur" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." @@ -3545,8 +3578,8 @@ "captcha à l'enregistrement." #: 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "Enregistrer les options" @@ -3655,10 +3688,6 @@ msgid "Kallithea version" msgstr "Version de Kallithea" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "Vérifier les mises à jour" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "Fichier de configuration de Kallithea" @@ -3679,15 +3708,7 @@ msgid "Git path" msgstr "Chemin de Git" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "Point d'accès aux informations de mise à jour" - -#: kallithea/templates/admin/settings/settings_system.html:13 -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:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "Paquets Python" @@ -3696,30 +3717,22 @@ msgstr "Afficher la taille du dépôt après un push" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "Journaliser les commandes de push" - -#: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "Journaliser les commandes de pull" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 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:33 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Mercurial extensions" msgstr "Extensions Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "Activer l'extension largefiles" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "Activer l'extension hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." @@ -3727,11 +3740,11 @@ "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:59 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "Location of repositories" msgstr "Emplacement des dépôts" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect." @@ -3739,7 +3752,7 @@ "Cliquez pour déverrouiller. Vous devez redémarrer Kallithea pour ce que " "réglage prenne effet." -#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3808,11 +3821,28 @@ "emplacement réseau/hôte du serveur Kallithea en cours d'utilisation." #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +#, fuzzy +#| msgid "Clone URL" +msgid "HTTP 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 construct clone-by-id" msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" "{repo}'.\n" @@ -3827,7 +3857,12 @@ " {repo} full " "repository name,\n" " {repoid} ID of " -"repository, can be used to construct clone-by-id" +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " msgstr "" "Modèle de construction d'URL de clone. Par exemple : '{scheme}://{user}" "@{netloc}/{repo}'.\n" @@ -3845,11 +3880,23 @@ " {repoid} ID du " "dépôt, peut être utilisé pour cloner par ID." -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +#| msgid "Clone URL" +msgid "SSH Clone URL" +msgstr "URL de clone" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Repository page size" msgstr "Taille de la page du dépôt" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." @@ -3857,11 +3904,11 @@ "Nombre d'éléments affichés dans les pages des dépôts avant d'afficher la " "pagination." -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "Taille de la page d'admin" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." @@ -3869,27 +3916,27 @@ "Nombre d'éléments affichés dans les grilles des pages admin avant " "d'afficher la pagination." -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "Icônes" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 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:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 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:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 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:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "Meta-tagging" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." @@ -3897,7 +3944,7 @@ "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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "Styliser les méta-tags reconnus :" @@ -4058,12 +4105,12 @@ msgstr "Support" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Dépôt Mercurial" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Dépôt Git" @@ -4111,157 +4158,132 @@ msgstr "Comparer" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Rechercher" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "Déverrouiller" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "Verrouiller" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "Suivre" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "Arrêter de suivre" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Fork" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Créer une requête de pull" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "Basculer vers" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "Aucune correspondance trouvée" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Show recent activity" msgstr "Afficher l'activité récente" -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/base/base.html:296 msgid "Public journal" msgstr "Journal public" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:301 msgid "Show public gists" msgstr "Afficher les gists publics" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:313 +#: kallithea/templates/base/base.html:306 msgid "All Public Gists" msgstr "Tous les Gists publics" -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:308 msgid "My Public Gists" msgstr "Mes Gists publics" -#: kallithea/templates/base/base.html:316 +#: kallithea/templates/base/base.html:309 msgid "My Private Gists" msgstr "Mes Gist privés" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "Recherche dans les dépôts" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Mes requêtes de pull" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "Non connecté" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "Connexion à votre compte" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "Vous n’avez pas de compte ?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "Se déconnecter" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "Révision parente" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "Révision fille" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" -msgstr "Hériter des réglages par défaut" +msgid "Create repositories" +msgstr "Création de dépôts" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" -"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:16 -msgid "default permissions" -msgstr "permissions par défaut" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "Création de dépôts" - -#: kallithea/templates/base/default_perms_box.html:27 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:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "Créer des groupes d'utilisateurs" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 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:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "Forker les dépôts" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à forker des " @@ -4982,7 +5004,7 @@ msgstr "Diff de fichier pour %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "Fichiers de %s" @@ -4994,7 +5016,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "Ajouter un nouveau fichier" @@ -5046,7 +5068,7 @@ msgstr "Chargement de la liste des fichiers…" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "Taille" @@ -5178,8 +5200,8 @@ msgstr "Followers de %s" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "Followers" @@ -5232,8 +5254,8 @@ msgstr "Forks de %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "Forks" @@ -5550,9 +5572,9 @@ msgid "File names" msgstr "Les noms de fichiers" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Permission refusée" @@ -5562,20 +5584,20 @@ msgstr "Statistiques pour %s" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "Flux ATOM pour %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "Flux RSS pour %s" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "Activer" @@ -5584,12 +5606,12 @@ msgstr "Statistiques obtenues : " #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "Fichiers" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "Afficher plus" @@ -5630,95 +5652,217 @@ msgid "%s Summary" msgstr "Résumé de %s" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "Dépôt verrouillé par %s" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "Dépôt déverrouillé" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "Fork de" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "Cloner depuis" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "Afficher par ID" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "URL de clone" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "Afficher par nom" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "Nom" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "Populaires" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "Téléchargements" -#: kallithea/templates/summary/summary.html:101 +#: kallithea/templates/summary/summary.html:109 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés" -#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:111 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:109 +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "Télécharger en ZIP" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 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:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "Avec les sous-dépôts" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "Flux" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "Derniers changements" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "Démarrage rapide" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "Ajouter ou téléverser des fichiers directement via Kallithea" - #: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" -msgstr "Pusher le nouveau dépôt" +msgid "Add or upload files directly via Kallithea" +msgstr "Ajouter ou téléverser des fichiers directement via Kallithea" #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "Pusher le nouveau dépôt" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "Le dépôt existe déjà ?" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "Fichier Lisez-moi de la revision %s:%s" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "Télécharge %s comme %s" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Ce dépôt a été verrouillé par %s sur %s" + +#~ msgid "Repository has been locked" +#~ msgstr "Ce dépôt a été verrouillé" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Ce dépôt a été déverrouillé" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Une erreur est survenue durant le déverrouillage" + +#~ msgid "Invalid API key" +#~ msgstr "Clé d'API invalide" + +#~ msgid "Token mismatch" +#~ msgstr "Jeton d’authentification incorrect" + +#~ msgid "Enable locking" +#~ msgstr "Activer le verrouillage" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "Activer le verrouillage lors d’un pull sur le dépôt." + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "" +#~ "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" + +#~ msgid "Change Locking" +#~ msgstr "Changer le verrouillage" + +#~ msgid "Confirm to unlock repository." +#~ msgstr "Veuillez confirmer le déverrouillage de ce dépôt." + +#~ msgid "Unlock Repository" +#~ msgstr "Déverrouiller le dépôt" + +#~ msgid "Locked by %s on %s" +#~ msgstr "Verrouillé par %s sur %s" + +#~ msgid "Confirm to lock repository." +#~ msgstr "Veuillez confirmer le verrouillage de ce dépôt." + +#~ msgid "Lock Repository" +#~ msgstr "Verrouiller le dépôt" + +#~ msgid "Repository is not locked" +#~ msgstr "Ce dépôt n’est pas verrouillé" + +#~ 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 "" +#~ "Forcer le verrouillage du dépôt. Ne fonctionne que lorsque l'accès " +#~ "anonyme est désactivé. Déclencher un pull verrouille le dépôt. " +#~ "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." + +#~ msgid "What is that?" +#~ msgstr "Qu'est-ce que c'est ?" + +#~ msgid "URL by id" +#~ msgstr "URL par id" + +#~ msgid "Check for updates" +#~ msgstr "Vérifier les mises à jour" + +#~ msgid "Upgrade info endpoint" +#~ msgstr "Point d'accès aux informations de mise à jour" + +#~ msgid "Note: please make sure this server can access this URL" +#~ msgstr "Note : vérifiez que le serveur peut accéder cette URL" + +#~ msgid "Log user push commands" +#~ msgstr "Journaliser les commandes de push" + +#~ msgid "Log user pull commands" +#~ msgstr "Journaliser les commandes de pull" + +#~ msgid "Unlock" +#~ msgstr "Déverrouiller" + +#~ msgid "Lock" +#~ msgstr "Verrouiller" + +#~ msgid "Inherit defaults" +#~ msgstr "Hériter des réglages par défaut" + +#~ msgid "" +#~ "Select to inherit global settings, IP whitelist and permissions from " +#~ "the %s." +#~ msgstr "" +#~ "Sélectionner pour hériter des réglages généraux, de la liste blanche " +#~ "d'IP et des permissions depuis les %s." + +#~ msgid "default permissions" +#~ msgstr "permissions par défaut" + +#~ msgid "Repository locked by %s" +#~ msgstr "Dépôt verrouillé par %s" + +#~ msgid "Repository unlocked" +#~ msgstr "Dépôt déverrouillé" + +#~ msgid "Show by ID" +#~ msgstr "Afficher par ID" + +#~ msgid "Show by Name" +#~ msgstr "Afficher par nom" + #~ msgid "" #~ "Changing status on a changeset associated with a closed pull request " #~ "is not allowed" @@ -6150,9 +6294,6 @@ #~ msgid "invalid user name" #~ msgstr "nom d’utilisateur invalide" -#~ msgid "Your account is disabled" -#~ msgstr "Votre compte est désactivé" - #~ msgid "invalid clone URL" #~ msgstr "URL de clonage invalide"
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,12 +1,11 @@ # Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2015-04-11 00:59+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian <https://hosted.weblate.org/projects/kallithea/" @@ -19,14 +18,14 @@ "X-Generator: Weblate 2.3-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,101 +34,101 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 msgid "No permission to change status" msgstr "" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 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:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -139,119 +138,113 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 msgid "There are no files yet." msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "" @@ -260,11 +253,11 @@ msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -272,177 +265,177 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -458,21 +451,21 @@ msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" @@ -484,123 +477,134 @@ msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 -#: kallithea/controllers/admin/users.py:249 -msgid "5 minutes" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 -#: kallithea/controllers/admin/users.py:250 -msgid "1 hour" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 -#: kallithea/controllers/admin/users.py:251 -msgid "1 day" +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +msgid "SSH key successfully deleted" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -608,9 +612,9 @@ msgid "Read" msgstr "" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -618,9 +622,9 @@ msgid "Write" msgstr "" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -643,363 +647,346 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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:42 -#: kallithea/templates/base/root.html:50 -msgid "Disabled" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 -msgid "Allowed with manual account activation" +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" msgstr "" #: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:466 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:468 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -#, fuzzy -msgid "Repository has been locked" -msgstr "Ennek a tárolónak %s elágazása van" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -#, fuzzy -msgid "Repository has been unlocked" -msgstr "Ennek a tárolónak %s elágazása van" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format #| msgid "Private Repository" msgid "Invalidated %s repositories" msgstr "Tároló törlése" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "" +#: kallithea/controllers/admin/settings.py:357 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + #: kallithea/controllers/admin/settings.py:360 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - -#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1029,218 +1016,218 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1248,69 +1235,96 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "" @@ -1319,133 +1333,133 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1471,302 +1485,313 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, python-format +msgid "SSH key %r not found" +msgstr "" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1807,24 +1832,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1841,7 +1872,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1849,11 +1880,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1868,7 +1899,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1876,7 +1907,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -2032,10 +2063,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2084,22 +2117,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2117,14 +2150,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2132,36 +2165,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2208,8 +2230,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2242,7 +2266,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2278,23 +2302,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2322,7 +2348,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2382,7 +2408,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2395,24 +2421,29 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 -msgid "API Keys" -msgstr "" - #: kallithea/templates/admin/my_account/my_account.html:29 -msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:30 -#: kallithea/templates/journal/journal.html:33 -msgid "Watched Repositories" +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:32 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:33 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2439,7 +2470,9 @@ msgstr "A csoport törlésének megerősítése" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2455,12 +2488,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2561,6 +2596,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "A csoport törlésének megerősítése" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" @@ -2577,7 +2648,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2613,7 +2684,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2773,7 +2844,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2879,17 +2950,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "A csoport törlésének megerősítése" @@ -2920,14 +2985,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2937,7 +3002,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -2989,8 +3054,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -3024,69 +3089,32 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3187,19 +3215,11 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "Permanent URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3209,31 +3229,31 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy msgid "Remote repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3342,8 +3362,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "" @@ -3438,10 +3458,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3462,15 +3478,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3479,46 +3487,38 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3567,8 +3567,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3586,56 +3585,71 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Repository page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3796,12 +3810,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3849,151 +3863,128 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" +msgid "Create repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -msgid "default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4708,7 +4699,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4720,7 +4711,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4772,7 +4763,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4900,8 +4891,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -4952,8 +4943,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5261,9 +5252,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5273,20 +5264,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5295,12 +5286,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5341,95 +5332,107 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" +msgid "Add or upload files directly via Kallithea" msgstr "" #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "" #, fuzzy +#~ msgid "Repository has been locked" +#~ msgstr "Ennek a tárolónak %s elágazása van" + +#, fuzzy +#~ msgid "Repository has been unlocked" +#~ msgstr "Ennek a tárolónak %s elágazása van" + +#, fuzzy #~| msgid "Remote repository" #~ msgid "Repository Group" #~ msgstr "Tároló törlése"
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-08-27 07:23+0000\n" "Last-Translator: leela <53352@protonmail.com>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/kallithea/" @@ -18,14 +17,14 @@ "X-Generator: Weblate 3.9-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "まだチェンジセットがありません" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,96 +33,96 @@ msgid "None" msgstr "なし" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(閉鎖済み)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "空白を表示" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "空白を無視" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "diff コンテキストを %(num)s 行増やす" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permission to change pull request status" msgid "No permission to change status" msgstr "プルリクエストステータスを変更する権限がありません" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "お探しのリビジョンはこのリポジトリにはありません" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, fuzzy, python-format #| msgid "Go to tip of repository" msgid "Could not find other repository %s" msgstr "リポジトリの最新のリビジョン(tip)に移動" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 #, fuzzy #| msgid "Cannot compare repositories without using common ancestor" msgid "Cannot compare repositories of different types" msgstr "共通の祖先を持たないのでリポジトリを比較できません" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 msgid "Cannot show empty diff" msgstr "" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "共通の祖先を持たないのでリポジトリを比較できません" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "応答がありません" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "不明なエラー" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" "形式が間違っているため、サーバーはリクエストを処理できませんでした。" -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "リソースにアクセスする権限がありません" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "このページを閲覧する権限がありません" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "リソースが見つかりません" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -131,12 +130,12 @@ "サーバーが不正な状態になったため、リクエストに答えることができませんでし" "た。" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s が %s にコミット" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -146,123 +145,117 @@ msgid "Changeset was too big and was cut off..." msgstr "チェンジセットが大きすぎるため、省略しました..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s %s フィード" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "%s リポジトリでの変更" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "新しいファイルを追加" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "まだファイルがありません。 %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, fuzzy, python-format msgid "%s at %s" msgstr "%s と %s の間" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "このリポジトリは %s によって %s にロックされました" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Kallithea経由で %s を削除" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "%s ファイルの削除に成功しました" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます " -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Kallithea経由で %s を変更" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "変更点なし" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Kallithea経由でファイルを追加" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "内容がありません" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "ファイル名がありません" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "場所には相対パスかつ .. を含まないパスを入力してください" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "空のリポジトリ" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "チェンジセット" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "ブランチ" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "タグ" @@ -271,11 +264,11 @@ msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "グループ" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -283,186 +276,186 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "リポジトリ" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "ブランチ" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "閉鎖済みブランチ" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "タグ" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "ブックマーク" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "公開ジャーナル" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "ジャーナル" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "キャプチャが一致しません" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "%sへの登録を受け付けました" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "パスワードリセットの確認コードが送信されました" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "無効なパスワードリセットトークン" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "パスワードを更新しました" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (閉鎖済み)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "チェンジセット" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "スペシャル" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "相手のブランチ" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "ブックマーク" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "プルリクエスト作成中にエラーが発生しました: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストの作成に成功しました" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "プルリクエストレビュアー" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "説明がありません" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "プルリクエストを更新しました" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, 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:522 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:524 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" "このプルリクエストはすでにクローズされていて、更新することはできません。" -#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, 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:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "ノート: ブランチ%sには別のヘッド%sがあります。" -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 #, 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:566 +#: kallithea/controllers/pullrequests.py:564 #, 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:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -478,21 +471,21 @@ msgid "An error occurred during search operation." msgstr "検索を実行する際にエラーが発生しました。" -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "まだデータの準備ができていません" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "認証設定の更新に成功しました" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "認証設定の更新中にエラーが発生しました" @@ -504,123 +497,137 @@ msgid "Error occurred during update of defaults" msgstr "デフォルト設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "永久" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 分" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 時間" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 日" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 ヶ月" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "gist の作成中にエラーが発生しました" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "gist %s を削除しました" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "変更しない" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Gist の内容を更新しました" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "Gist データを更新しました" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "Gist %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーはアプリケーション全体で非常に重要なので編集できません" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "アカウントの更新に成功しました" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "パスワードの更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメールアドレス %s を追加しました" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "ユーザーからメールアドレスを削除しました" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "APIキーの作成に成功しました" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "APIキーのリセットに成功しました" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "APIキーの削除に成功しました" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "APIキーの作成に成功しました" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "APIキーの削除に成功しました" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -628,9 +635,9 @@ msgid "Read" msgstr "読込" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -638,9 +645,9 @@ msgid "Write" msgstr "書込" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -663,255 +670,240 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "無効" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "手動でアカウントをアクティベートする" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "自動でアカウントをアクティベートする" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "有効" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "全般の権限の更新に成功しました" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "リポジトリグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "リポジトリグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "このグループは %s 個のサブグループを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "自分自身の管理者としての権限を取り消すことはできません" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "リポジトリグループ権限を更新しました" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "権限の取消中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "リポジトリ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成しました" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "%s 個のフォークを切り離しました" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "%s 個のフォークを削除しました" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" "フォークしたリポジトリが存在するため、 リポジトリ %s は削除できません" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "%s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "リポジトリ権限を更新しました" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "フィールドの削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- フォークではありません --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "ありません" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "%s リポジトリを %s のフォークとする" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "リポジトリがロックされました" - -#: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "リポジトリのロックが解除されました" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "アンロック中にエラーが発生しました" - -#: kallithea/controllers/admin/repos.py:528 +#: kallithea/controllers/admin/repos.py:490 msgid "Cache invalidation successful" msgstr "キャッシュの無効化に成功しました" -#: kallithea/controllers/admin/repos.py:532 +#: kallithea/controllers/admin/repos.py:494 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "リモートから取得" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "VCS設定を更新しました" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -919,111 +911,111 @@ "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に" "出来ません" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s。" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format #| msgid "Invalidate cache for all repositories" msgid "Invalidated %s repositories" msgstr "すべてのリポジトリのキャッシュを無効化する" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "まだデータの準備ができていません" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "フックを更新しました" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "ユーザーグループ %s を作成しました" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 msgid "An error occurred during deletion of user group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "対象に同じ物を選ぶことはできません" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "ユーザーグループ権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" @@ -1053,223 +1045,225 @@ msgid "The default user cannot be edited" msgstr "デフォルト ユーザーを編集できません" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "ユーザーホワイトリストにIP %s を追加しました" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "IPアドレスの保存中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" "このアクションを実行するためには登録済みのユーザーである必要があります" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "APIキーが無効です" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "ファイルシステム内にリポジトリが見つかりません" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "リビジョンが見つかりません" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "アカウントは無効です" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "バイナリファイル" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メ" "ニューを使用してください" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "検出された変更はありません" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "リビジョンが見つかりません" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "比較ビュー" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "と" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "%s 以上" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "リビジョン" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "フォーク名 %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "プルリクエスト #%s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "リポジトリからアーカイブを[ダウンロード]" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "ユーザーを[作成]" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "ユーザーグループを[作成]" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "ユーザーグループを[更新]" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[プッシュ]" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "リポジトリに[Kallithea経由でコミット]" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[プル]" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "ファイルはありません" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "新しいファイル" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "変更" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "削除" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "リネーム" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1280,63 +1274,90 @@ "られたか名前が変更されたためです。リポジトリをもう一度チェックするためにア" "プリケーションを再起動してください" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "%s 以内" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "%s 前" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "%s と %s の間" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "たったいま" @@ -1345,140 +1366,140 @@ msgid "on line %s" msgstr "%s 行目" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "top level" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Kallithea 管理者" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "デフォルトユーザーは新しいリポジトリにアクセスできません" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" "デフォルトユーザーは新しいリポジトリに読み取りアクセスする権限があります" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" "デフォルトユーザーは新しいリポジトリに書き込みアクセスする権限があります" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "管理者のみがリポジトリのグループを作成できます" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "非管理者がリポジトリのグループを作成できます" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "管理者だけがユーザー グループを作成することができます" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "非管理者ユーザーがグループを作成することができます" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "管理者だけがトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "非管理者がトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "管理者のみがリポジトリをフォークすることができます" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 #, fuzzy msgid "Non-admins can fork repositories" msgstr "非管理者がリポジトリをフォークすることができます" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "新規登録を無効にする" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "未レビュー" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "レビュー中" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "承認" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "承認" @@ -1504,7 +1525,7 @@ msgid "Name must not contain only digits" msgstr "数字だけの名前は使えません" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, fuzzy, python-format #| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgid "" @@ -1512,30 +1533,30 @@ "%(branch)s" msgstr "プルリクエストに[コメント]" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "新しいユーザー %(new_username)s が登録されました" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, 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:171 +#: kallithea/model/notification.py:170 #, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "クローズ" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" @@ -1543,64 +1564,80 @@ "%(user)s がプリリクエスト #%(pr_nice_id)s: %(pr_title)s のレビューを求めて" "います" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| msgid "Error creating pull request: %s" msgid "Cannot create empty pull request" msgstr "プルリクエスト作成中にエラーが発生しました: %s" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 #, 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 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "最新のtip" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "SSH key %r not found" +msgstr "リビジョンが見つかりません" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "新規ユーザー登録" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 #, fuzzy msgid "" "You can't remove this user since it is crucial for the entire application" @@ -1608,7 +1645,7 @@ "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不" "可欠です。" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1617,7 +1654,7 @@ "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできま" "せん。リポジトリの所有者を変更するか削除してください： %s" -#: kallithea/model/user.py:263 +#: kallithea/model/user.py:260 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " @@ -1626,7 +1663,7 @@ "ユーザー \"%s\" はまだ %s 個のリポジトリグループの所有者のため削除すること" "はできません。リポジトリグループの所有者を変更するか削除してください： %s" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:267 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1635,36 +1672,36 @@ "ユーザー \"%s\" はまだ %s 個のユーザーグループの所有者のため削除することは" "できません。ユーザーグループの所有者を変更するか削除してください。 %s" -#: kallithea/model/user.py:364 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "パスワードリセットのリンク" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "パスワードの再設定通知" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "空のリストにはできません" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "ユーザー名 \"%(username)s\" はすでに使われています" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "ユーザー名 %(username)s は使用できません" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 msgid "" "Username may only contain alphanumeric characters underscores, periods or " "dashes and must begin with an alphanumeric character or underscore" @@ -1673,25 +1710,25 @@ "か使えません。また、アルファベットまたはアンダースコア(_)から始まる必要が" "あります" -#: kallithea/model/validators.py:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "入力が正しくありません" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "不正なユーザーグループ名です" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "ユーザーグループ \"%(usergroup)s\" はすでに存在します" -#: kallithea/model/validators.py:136 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1699,105 +1736,101 @@ "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッ" "シュ(-)しか使えません。また、アルファベットから始まる必要があります" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "このグループは親にできません" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "グループ \"%(group_name)s\" はすでに存在します" -#: kallithea/model/validators.py:179 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "古いpasswordが間違っています" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "ユーザー名とパスワードの組み合わせが無効です" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "トークンが一致しません" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "リポジトリ %(repo)s はすでに存在します" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "無効なリポジトリのURL" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "フォークは親と同じ種別の必要があります" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "このグループにリポジトリを作成する権限がありません" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "ルートにリポジトリを作成する権限がありません" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "この場所にグループを作成する権限がありません" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "不正なパスです" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "このメールアドレスはすでに取得されています" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "メールアドレス \"%(email)s\" がみつかりません" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1805,11 +1838,11 @@ "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同" "じです" -#: kallithea/model/validators.py:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "有効なIPv4かIPv6のアドレスを入力してください" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" @@ -1817,17 +1850,17 @@ "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不" "正です)" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "キー名にはアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数" "字が使えます" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "ファイル名はディレクトリ内にすることはできません" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1870,24 +1903,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "説明" @@ -1904,7 +1943,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1912,11 +1951,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "所有者" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "ログイン" @@ -1931,7 +1970,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1939,7 +1978,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "パスワード" @@ -2096,10 +2135,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "アクション" @@ -2150,22 +2191,22 @@ msgstr "プラグイン" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "保存" @@ -2183,14 +2224,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2200,36 +2241,25 @@ "す。" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "統計を有効にする" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "概要ページの統計ウィンドウを有効にします。" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "ダウンロードを有効にする" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "ロックを有効にする" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "リポジトリのpullのロックを有効にします。" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2278,8 +2308,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "しない" @@ -2312,7 +2344,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "新しい Gist を作成" @@ -2350,23 +2382,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2394,7 +2428,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2454,7 +2488,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "アカウント" @@ -2467,24 +2501,31 @@ msgid "Email Addresses" msgstr "メールアドレス" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +#| msgid "API Keys" +msgid "SSH Keys" +msgstr "APIキー" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "APIキー" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 msgid "Owned Repositories" msgstr "所有しているリポジトリ" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "ウォッチ中のリポジトリ" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "権限の表示" @@ -2511,7 +2552,9 @@ msgstr "このAPIキーを削除してもよろしいですか？: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "削除" @@ -2527,12 +2570,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "追加" @@ -2634,6 +2679,49 @@ msgid "Name" msgstr "名前" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "名字" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +#| msgid "Confirm to remove this API key: %s" +msgid "Confirm to remove this SSH key: %s" +msgstr "このAPIキーを削除してもよろしいですか？: %s" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +#| msgid "New API key" +msgid "New SSH key" +msgstr "新しいAPIキー" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public Gist" +msgid "Public key" +msgstr "公開 Gist" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "あなたがウォッチしているリポジトリ" @@ -2650,7 +2738,7 @@ msgstr "全般" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "IPアドレスのホワイトリスト" @@ -2694,7 +2782,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2868,7 +2956,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "高度な設定" @@ -2982,19 +3070,11 @@ "このグループに属する全ての子要素のパーミッションを設定または無効化します。" "選択されていれば、非公開でないリポジトリや他のリポジトリも対象に含みます。" -#: 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:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "このグループを削除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "このグループを削除してもよろしいですか？: %s" @@ -3023,7 +3103,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3031,7 +3111,7 @@ "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "オプション：このリポジトリが属するグループを選択します" @@ -3041,7 +3121,7 @@ msgstr "作成するリポジトリの種別を指定します" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "ランディングリビジョン" @@ -3099,8 +3179,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "統計" @@ -3135,68 +3215,31 @@ msgstr "" "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" -msgstr "ロック" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "このリポジトリのロックを解除しますか." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "リポジトリのロックを解除" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "このリポジトリをロックしますか." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "リポジトリをロック" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "リポジトリはロックされていません" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Delete this Repository" msgstr "このリポジトリを削除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "フォークの切り離し" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "フォークも削除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3297,19 +3340,13 @@ msgid "This repository does not have a remote repository URL." msgstr "このリポジトリにリモートURLは設定されていません" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#, fuzzy +#| msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "リポジトリID" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "これは何？" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "id を使ってURLを表現" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3324,15 +3361,15 @@ "この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLを固定化した" "いときに便利です。" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "リモートリポジトリ" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "リポジトリURL" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3340,20 +3377,20 @@ "オプション: リモートリポジトリのURLです。設定した場合、このURLから変更を取" "得することができます。" -#: kallithea/templates/admin/repos/repo_edit_settings.html:38 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定し" "ます" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 #, fuzzy #| msgid "Type name of reviewer to add" msgid "Type name of user" msgstr "追加するレビュアーの名前を入力" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "リポジトリの所有者を変更" @@ -3464,8 +3501,8 @@ "す。" #: 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "設定を保存" @@ -3573,10 +3610,6 @@ msgid "Kallithea version" msgstr "Kallithea バージョン" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "更新を確認" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "Kallithea の設定ファイル" @@ -3597,15 +3630,7 @@ msgid "Git path" msgstr "Git パス" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "更新情報のエンドポイント" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "ノート: サーバーがこのURLにアクセスできることを確認して下さい" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "Python パッケージ" @@ -3614,30 +3639,22 @@ msgstr "プッシュ後にリポジトリのサイズを表示する" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "ユーザーのプッシュコマンドを記録する" - -#: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "ユーザーのプルコマンドを記録する" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリを更新する (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Mercurial extensions" msgstr "Mercurialエクステンション" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "largefilesエクステンションを有効にする" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "hgsubversionエクステンションを有効にする" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." @@ -3645,18 +3662,18 @@ "hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリを" "クローンしてMercurialリポジトリに変換するすることが可能です。" -#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "Location of repositories" msgstr "リポジトリの場所" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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:68 +#: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3719,8 +3736,9 @@ "{netloc} Kallithea サーバーのアドレスまたはホスト名" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +#, fuzzy +#| msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "クローンURL" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3748,7 +3766,12 @@ " {repo} full " "repository name,\n" " {repoid} ID of " -"repository, can be used to construct clone-by-id" +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " msgstr "" "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のような形" "式にします。使える変数は下記の通りです:\n" @@ -3764,13 +3787,25 @@ " {repoid} リポジト" "リの ID。 clone-by-id に使います。" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +#| msgid "Clone URL" +msgid "SSH Clone URL" +msgstr "クローンURL" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repository Size" msgid "Repository page size" msgstr "リポジトリサイズ" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 #, fuzzy #| msgid "" #| "Number of items displayed in the admin pages grids before pagination " @@ -3780,45 +3815,45 @@ "shown." msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 #, fuzzy #| msgid "Admin pages items" msgid "Admin page size" msgstr "管理ページの項目" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "アイコン" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "公開リポジトリのアイコンを表示する" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "非公開リポジトリのアイコンを表示する" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "リポジトリ名の隣に公開/非公開アイコンを表示します。" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "メタタグ" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "次のメタタグを変換する:" @@ -3979,12 +4014,12 @@ msgstr "サポート" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Gitリポジトリ" @@ -4032,160 +4067,135 @@ msgstr "比較" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "検索" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "アンロック" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "ロック" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "フォロー" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "アンフォロー" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "フォーク" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "ブランチの切り替え" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "一致するものが見つかりません" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Show recent activity" msgstr "最近の活動を表示" -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/base/base.html:296 msgid "Public journal" msgstr "公開ジャーナル" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:301 msgid "Show public gists" msgstr "公開 gists を表示" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:313 +#: kallithea/templates/base/base.html:306 msgid "All Public Gists" msgstr "すべての公開 Gists" -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:308 msgid "My Public Gists" msgstr "公開 Gists" -#: kallithea/templates/base/base.html:316 +#: kallithea/templates/base/base.html:309 msgid "My Private Gists" msgstr "非公開 Gists" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "リポジトリから検索" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "私のプルリクエスト" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "ログインしていません" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "あなたのアカウントにログイン" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "パスワードを忘れた?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "アカウントを持っていない?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "ログアウト" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "親リビジョン" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "子リビジョン" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" -msgstr "デフォルト権限を継承" +msgid "Create repositories" +msgstr "リポジトリを作成する" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "デフォルトの権限" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "リポジトリを作成する" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" "ユーザーにリポジトリ作成を許可する場合はこのオプションを選んでください" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "ユーザーグループを作成" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" "ユーザーにユーザーグループの作成を許可する場合はこのオプションを選んでくだ" "さい" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "リポジトリをフォークする" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" "ユーザーにリポジトリのフォークを許可する場合はこのオプションを選んでくださ" @@ -4934,7 +4944,7 @@ msgstr "%s ファイル差分" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "%s ファイル" @@ -4946,7 +4956,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "新しいファイルを追加" @@ -4999,7 +5009,7 @@ msgstr "ファイル一覧を読み込み中..." #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "サイズ" @@ -5130,8 +5140,8 @@ msgstr "%s フォロワー" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "フォロワー" @@ -5184,8 +5194,8 @@ msgstr "%s フォーク" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "フォーク" @@ -5504,9 +5514,9 @@ msgid "File names" msgstr "ファイル名" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "権限がありません" @@ -5516,20 +5526,20 @@ msgstr "%s 統計情報" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM フィード" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "%s RSS フィード" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "有効にする" @@ -5538,12 +5548,12 @@ msgstr "収集した統計情報: " #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "ファイル" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "もっと表示" @@ -5584,94 +5594,196 @@ msgid "%s Summary" msgstr "%s 要約" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "リポジトリは %s によってロックされました" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "リポジトリはロックされていません" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "フォーク元" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "クローン元" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "IDで表示" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "クローンURL" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "名前で表示" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "名字" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "トレンドファイル" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "ダウンロード" -#: kallithea/templates/summary/summary.html:101 +#: kallithea/templates/summary/summary.html:109 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:111 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: kallithea/templates/summary/summary.html:109 +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "ZIPでダウンロード" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "サブリポジトリを含める" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "フィード" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "最近の変更" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "クイックスタート" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "Kallithea経由で直接ファイルを追加またはアップロード" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 msgid "Push new repository" msgstr "新しいリポジトリをプッシュ" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "存在するリポジトリをプッシュ" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "リビジョン %s:%s の README ファイル" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "%s を %s でダウンロード" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "このリポジトリは %s によって %s にロックされました" + +#~ msgid "Repository has been locked" +#~ msgstr "リポジトリがロックされました" + +#~ msgid "Repository has been unlocked" +#~ msgstr "リポジトリのロックが解除されました" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "アンロック中にエラーが発生しました" + +#~ msgid "Invalid API key" +#~ msgstr "APIキーが無効です" + +#~ msgid "Token mismatch" +#~ msgstr "トークンが一致しません" + +#~ msgid "Enable locking" +#~ msgstr "ロックを有効にする" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "リポジトリのpullのロックを有効にします。" + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "" +#~ "グループに対してpullのロックを有効にします。このオプションはグループに" +#~ "含まれる全てのグループとリポジトリに適用されます。" + +#~ msgid "Change Locking" +#~ msgstr "ロック" + +#~ msgid "Confirm to unlock repository." +#~ msgstr "このリポジトリのロックを解除しますか." + +#~ msgid "Unlock Repository" +#~ msgstr "リポジトリのロックを解除" + +#~ msgid "Confirm to lock repository." +#~ msgstr "このリポジトリをロックしますか." + +#~ msgid "Lock Repository" +#~ msgstr "リポジトリをロック" + +#~ msgid "Repository is not locked" +#~ msgstr "リポジトリはロックされていません" + +#~ msgid "What is that?" +#~ msgstr "これは何？" + +#~ msgid "URL by id" +#~ msgstr "id を使ってURLを表現" + +#~ msgid "Check for updates" +#~ msgstr "更新を確認" + +#~ msgid "Upgrade info endpoint" +#~ msgstr "更新情報のエンドポイント" + +#~ msgid "Note: please make sure this server can access this URL" +#~ msgstr "ノート: サーバーがこのURLにアクセスできることを確認して下さい" + +#~ msgid "Log user push commands" +#~ msgstr "ユーザーのプッシュコマンドを記録する" + +#~ msgid "Log user pull commands" +#~ msgstr "ユーザーのプルコマンドを記録する" + +#~ msgid "Unlock" +#~ msgstr "アンロック" + +#~ msgid "Lock" +#~ msgstr "ロック" + +#~ msgid "Inherit defaults" +#~ msgstr "デフォルト権限を継承" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "デフォルトの権限" + +#~ msgid "Repository locked by %s" +#~ msgstr "リポジトリは %s によってロックされました" + +#~ msgid "Repository unlocked" +#~ msgstr "リポジトリはロックされていません" + +#~ msgid "Show by ID" +#~ msgstr "IDで表示" + +#~ msgid "Show by Name" +#~ msgstr "名前で表示" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "" #~ "検索するためのインデックスがありません。whooshでインデックスを作成して" @@ -5996,9 +6108,6 @@ #~ msgid "invalid user name" #~ msgstr "不正なユーザー名です" -#~ msgid "Your account is disabled" -#~ msgstr "アカウントは無効です" - #~ msgid "invalid clone URL" #~ msgstr "無効なクローンURIです"
--- a/kallithea/i18n/kallithea.pot Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/kallithea.pot Mon Sep 02 21:43:37 2019 +0200 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 0.4.0\n" +"Project-Id-Version: Kallithea 0.4.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,14 +18,14 @@ "Generated-By: Babel 2.6.0\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,97 +34,97 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:90 kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 msgid "No permission to change status" msgstr "" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 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:84 +#: kallithea/controllers/error.py:85 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -134,119 +134,113 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 msgid "There are no files yet." msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:184 -#: kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 kallithea/controllers/pullrequests.py:182 +#: kallithea/model/scm.py:676 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:185 -#: kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 kallithea/controllers/pullrequests.py:183 +#: kallithea/model/scm.py:687 msgid "Tags" msgstr "" @@ -255,187 +249,187 @@ msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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:56 kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -451,21 +445,21 @@ msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" @@ -477,123 +471,134 @@ msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 -#: kallithea/controllers/admin/users.py:249 -msgid "5 minutes" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 -#: kallithea/controllers/admin/users.py:250 -msgid "1 hour" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 -#: kallithea/controllers/admin/users.py:251 -msgid "1 day" +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +msgid "SSH key successfully deleted" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -601,9 +606,9 @@ msgid "Read" msgstr "" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -611,9 +616,9 @@ msgid "Write" msgstr "" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -636,358 +641,343 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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:42 -#: kallithea/templates/base/root.html:50 -msgid "Disabled" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 -msgid "Allowed with manual account activation" +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" msgstr "" #: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:466 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:468 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "" +#: kallithea/controllers/admin/settings.py:357 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + #: kallithea/controllers/admin/settings.py:360 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - -#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1017,282 +1007,309 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 kallithea/templates/changelog/changelog.html:43 +#: kallithea/lib/helpers.py:730 kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, 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:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "" @@ -1301,131 +1318,131 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1451,273 +1468,284 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on %(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" +#: kallithea/model/pull_request.py:360 +#, python-format +msgid "This iteration is based on another %s revision and there is no simple diff." +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 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, python-format +msgid "SSH key %r not found" +msgstr "" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn+https URL" msgstr "" +#: kallithea/model/validators.py:430 +msgid "Fork has to be the same type as parent" +msgstr "" + #: kallithea/model/validators.py:445 -msgid "Fork has to be the same type as parent" -msgstr "" - -#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1758,24 +1786,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1792,7 +1826,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1800,11 +1834,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1819,7 +1853,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1827,7 +1861,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -1979,10 +2013,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2029,22 +2065,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2062,49 +2098,38 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 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_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2149,8 +2174,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2183,7 +2210,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2219,23 +2246,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2263,7 +2292,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2323,7 +2352,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2336,24 +2365,29 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 -msgid "API Keys" -msgstr "" - #: kallithea/templates/admin/my_account/my_account.html:29 -msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:30 -#: kallithea/templates/journal/journal.html:33 -msgid "Watched Repositories" +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:32 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:33 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2380,7 +2414,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2396,12 +2432,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2501,6 +2539,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" @@ -2517,7 +2591,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2548,7 +2622,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2694,7 +2768,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2798,15 +2872,11 @@ 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2832,13 +2902,13 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2848,7 +2918,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -2894,8 +2964,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -2927,65 +2997,32 @@ 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 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 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 "" @@ -3077,47 +3114,39 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "Permanent URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 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:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3219,8 +3248,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "" @@ -3304,10 +3333,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3328,15 +3353,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3345,42 +3362,34 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." msgstr "" @@ -3420,8 +3429,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3432,50 +3440,61 @@ " {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" +" {repoid} ID of repository, can be used to construct clone-by-id,\n" +" {system_user} name of the Kallithea system user,\n" +" {hostname} server hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "Schema for constructing SSH clone URL, eg. 'ssh://{system_user}@{hostname}/{repo}'." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:68 +msgid "Number of items displayed in the repository pages before pagination is shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:73 +msgid "Admin page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "Number of items displayed in the admin pages grids before pagination is shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 -msgid "Icons" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:75 -msgid "Show public repository icon on repositories" -msgstr "" - #: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Icons" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:86 +msgid "Show public repository icon on repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3634,11 +3653,11 @@ msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:86 kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:86 kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:89 kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:89 kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3686,148 +3705,127 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:171 kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" +msgid "Create repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "Select to inherit global settings, IP whitelist and permissions from the %s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -msgid "default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4523,7 +4521,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4535,7 +4533,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4587,7 +4585,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4715,8 +4713,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -4767,8 +4765,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5070,9 +5068,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5082,20 +5080,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5104,12 +5102,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5150,90 +5148,94 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" +msgid "Add or upload files directly via Kallithea" msgstr "" #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr ""
--- a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2017 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-04-30 22:25+0000\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/" @@ -18,14 +17,14 @@ "X-Generator: Weblate 3.6.1\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Ingen endringssett enda" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,95 +33,95 @@ msgid "None" msgstr "Ingen" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(lukket)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Vis blanktegn" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorer blanktegn" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Øk diff-bindeleddsinformasjon til %(num)s linjer" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permission to change pull request status" msgid "No permission to change status" msgstr "Ingen tilgang til endring av innsendingsforespørselsstatus" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "Slettet flettingsforespørsel %s" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "En slik revisjon funnes ikke for denne pakkebrønnen" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "Fant ikke annen pakkebrønn %s" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "Kan ikke sammenligne pakkebrønner av forskjellige typer" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 #, fuzzy msgid "Cannot show empty diff" msgstr "Kan ikke vise tom diff" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "Kan ikke sammenligne pakkebrønner uten bruk av felles opphav" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Ingen respons" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Ukjent feil" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" "Forespørselen kunne ikke forstås av tjeneren som følge av feilaktig " "syntaks." -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Uautorisert tilgang til ressurs" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "Du har ikke tilgang til å se denne siden" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Kunne ikke finne ressursen" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -130,12 +129,12 @@ "Tjeneren støtte på en uventet tilstand som forhindret utøvelse av " "forespørsel." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s sendte inn %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -145,125 +144,119 @@ msgid "Changeset was too big and was cut off..." msgstr "Endringsettet var for stort og har blitt avskåret…" -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, fuzzy, python-format msgid "%s %s feed" msgstr "%s %s kilde" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, fuzzy, python-format msgid "Changes on %s repository" msgstr "Endringer i %s-pakkebrønn" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Klikk her for å legge til ny fil" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Ingen filer enda. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, fuzzy, python-format msgid "%s at %s" msgstr "%s den %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Denne pakkebrønnen har blitt påst av %s den %s" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "" "Du kan bare slette filer med en revisjon som er en gyldig forgrening" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Slettet filen %s via Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Filen %s ble slettet" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Feil inntraff under innsendelse" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" "Du kan bare redigere filer med en revisjon som er en gyldig avgrening" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Filen %s ble endret via Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Ingen endringer" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Innsendt til %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Fil lagt til via Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Inget innhold" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Inget filnavn" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Plasseringen må være en relativ sti, og kan ikke inneholde .. i stien" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Nedlastinger avskrudd" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Ukjent revisjon %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Tom pakkebrønn" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Ukjent arkivtype" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Endringssett" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Forgreninger" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Etiketter" @@ -272,11 +265,11 @@ msgid "An error occurred during repository forking %s" msgstr "En uventet feil inntraff under forgrening av pakkebrønnen %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Grupper" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -284,11 +277,11 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Pakkebrønner" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 @@ -296,169 +289,169 @@ msgid "Branch" msgstr "Forgrening" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Lukkede forgreninger" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Etikett" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Bokmerke" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Offentlig loggbok" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Loggbok" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 #, fuzzy msgid "Bad captcha" msgstr "Feilaktig CAPTCHA" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, fuzzy, python-format msgid "You have successfully registered with %s" msgstr "Du har registrer deg på %s" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "Passordbekreftelseskode sendt" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Ugyldig passordtilbakestillingssymbol" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Passord oppdatert" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, fuzzy, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Ugyldig analytiker \"%s\" angitt" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (lukket)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Endringssett" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 #, fuzzy msgid "Special" msgstr "Spesiell" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Likemennsforgreninger" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Bokmerker" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Feil ved opprettelse av ny innsendelsesforespørsel: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Feil inntraff under opprettelse av innsendelsesforespørsel" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Åpnet en ny innsendelsesforespørsel" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Ingen beskrivelse" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Innsendingsforespørsel oppdatert" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Slettet innsendingsforespørsel" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:522 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Denne innsendingsforespørselen har allerede blitt flettet inn i %s." -#: kallithea/controllers/pullrequests.py:524 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" "Denne innsendingsforespørselen har blitt lukket, og kan ikke oppdateres." -#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Merk: Forgreningen %s har et annet hode: %s." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 msgid "Git pull requests don't support iterating yet." msgstr "" -#: kallithea/controllers/pullrequests.py:566 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -474,21 +467,21 @@ msgid "An error occurred during search operation." msgstr "Feil inntraff under søkeoperasjon." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Ingen data klar enda" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Statistikk er avskrudd for denne pakkebrønnen" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Autentiseringsinnstillinger oppdatert" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "feil inntraff under oppdatering av autentiseringsinnstillinger" @@ -500,127 +493,141 @@ msgid "Error occurred during update of defaults" msgstr "Feil inntraff under oppdatering av forvalg" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "For alltid" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "Fem minutter" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "Én time" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "Én dag" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "Én måned" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: kallithea/templates/admin/my_account/my_account_api_keys.html:65 #: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Livstid" -#: kallithea/controllers/admin/gists.py:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Feil inntraff under gist-opprettelse" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Slettet gist-en %s" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Uendret" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Oppdaterte gist-innhold" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "Oppdaterte gist-data" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, fuzzy, python-format msgid "Error occurred during update of gist %s" msgstr "Feil inntraff under oppdatering av gist-en %s" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Du kan ikke endre denne brukeren siden den er avgjørende for hele " "programmet" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Kontoen din ble oppdatert" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, fuzzy, python-format msgid "Error occurred during update of user %s" msgstr "Feil inntraff under oppdatering av brukeren %s" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Feil inntraff under oppdatering av brukerpassord" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, fuzzy, python-format msgid "Added email %s to user" msgstr "La til e-postadressen %s for bruker" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 #, fuzzy msgid "An error occurred during email saving" msgstr "Feil inntraff under lagring av e-postadresse" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 #, fuzzy msgid "Removed email from user" msgstr "Fjernet e-postadresse fra bruker" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API-nøkkel opprettet" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-nøkkel tilbakestilt" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-nøkkel slettet" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "API-nøkkel opprettet" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "API-nøkkel slettet" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -628,9 +635,9 @@ msgid "Read" msgstr "LEs" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -638,9 +645,9 @@ msgid "Write" msgstr "Skriv" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -663,368 +670,353 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Admin" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Avskrudd" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Tillatt med manuell kontoaktivering" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Tillatt med automatisk kontoaktivering" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Manuell aktivering av ekstern konto" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 msgid "Automatic activation of external account" msgstr "Automatisk aktivering av ekstern konto" -#: 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Påskrudd" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 #, fuzzy msgid "Global permissions updated successfully" msgstr "Globale tilganger oppdatert" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Feil inntraff under oppdatering av tilganger" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Feil inntraff under opprettelse av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Opprettet pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Oppdaterte pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Feil inntraff under oppdatering av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Denne gruppen inneholder %s pakkebrønner og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Denne grunnen inneholder %s undergrupper og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Fjernet pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Feil inntraff under sletting av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 #, fuzzy msgid "Cannot revoke permission for yourself as admin" msgstr "Kan ikke tilbakekalle egen administratortilgang" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Pakkebrønnsgruppetilganger oppdatert" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "En feil inntraff under tilbakekalling av tilgang" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Feil under opprettelse av pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Opprettet pakkebrønnen %s fra %s" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Forgrenet pakkebrønnen %s som %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Opprettet pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Pakkebrønnen %s ble oppdatert" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "Feil under oppdatering av pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "Avhektet %s forgreninger" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "Slettet %s forgreninger" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Slettet pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Kan ikke slette pakkebrønne %s, som fremdeles har forgreninger" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "En feil inntraff under sletting av %s" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Pakkebrønnstilganger oppdatert" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Feil inntraff under fjerning av felt" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Ikke en forgrening --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Oppdaterte pakkebrønnssynlighet i offentlig loggbok" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 #, fuzzy msgid "An error occurred during setting this repository in public journal" msgstr "" "En feil inntraff under innlemmelse av denne pakkebrønnen i offentlig " "loggbok" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Ingenting" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markerte pakkebrønnen %s som en forgrening av %s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "En feil inntraff under denne operasjonen" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Pakkebrønnen har blitt låst" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Pakkebrønnen har blitt låst opp" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "En feil inntraff under opplåsning" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "Oppdaterte VCS-innstillinger" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Skriv inn e-postadresse" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Ingen data klar enda" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Opprettet brukergruppe %s" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Oppdaterte brukergruppe %s" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:217 +#: kallithea/controllers/admin/user_groups.py:212 #, fuzzy msgid "Successfully deleted user group" msgstr "Brukergruppe slettet" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1054,226 +1046,226 @@ msgid "The default user cannot be edited" msgstr "Forvalgt bruker kan ikke redigeres" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "La til IP-adressen %s i brukerhvitlisten" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "Kunne ikke legge til IP-adresse" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "Fjernet IP-adressen fra brukerhvitlisten" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "Ugyldig API-nøkkel" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Binærfil" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "Forgreningsnavn %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "Flettingsforespørsel %s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 #, fuzzy msgid "[deleted] repository" msgstr "[slettet] pakkebrønn" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 #, fuzzy msgid "[created] repository" msgstr "[opprettet] pakkebrønn" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[opprettet] pakkebrønn som forgrening" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 #, fuzzy msgid "[forked] repository" msgstr "[forgrenet] pakkebrønn" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 #, fuzzy msgid "[updated] repository" msgstr "[oppdaterte] pakkebrønn" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 #, fuzzy msgid "[downloaded] archive from repository" msgstr "[lastet ned] arkiv fra pakkebrønn" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 #, fuzzy msgid "[delete] repository" msgstr "[slett] pakkebrønn" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "[opprettet] bruker" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "[oppdaterte] bruker" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "[opprettet] brukergruppe" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "[oppdaterte] brukergruppe" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 #, fuzzy msgid "[commented] on revision in repository" msgstr "[kommenterte] en revisjon i pakkebrønn" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "[kommenterte] flettingsforespørsel for" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "[lukket] flettingsforespørsel for" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[dyttet] til" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 #, fuzzy msgid "[committed via Kallithea] into repository" msgstr "[innsendt via Kallithea] inn i pakkebrønn" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Ingen filer" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "ny fil" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1281,69 +1273,96 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d år" msgstr[1] "%d år" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d måned" msgstr[1] "%d måneder" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%ed dager" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minutt" msgstr[1] "%d minutter" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekund" msgstr[1] "%d sekunder" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "om %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "for %s siden" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "om %s og %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s og %s siden" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "akkurat nå" @@ -1352,134 +1371,134 @@ msgid "on line %s" msgstr "på linje %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "toppnivå" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Kallithea-administrator" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 #, fuzzy msgid "Default user has no access to new repositories" msgstr "Forvalgt bruker har ingen tilgang til nye pakkebrønner" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "Ikke godkjent" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Godkjent" @@ -1505,302 +1524,313 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "Lukker" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, python-format +msgid "SSH key %r not found" +msgstr "" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Brukernavnet \"%(username)s\" finnes allerede" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Brukernavnet \"%(username)s\" kan ikke brukes" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Ugyldig brukergruppenavn" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Brukergruppen \"%(usergroup)s\" finnes allerede" -#: kallithea/model/validators.py:136 +#: 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:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Ugyldig gammelt passord" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Passordene samsvarer ikke" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "Ugyldig brukernavn eller passord" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "Symbol stemmer ikke overens" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "Ugyldig pakkebrønnsnettadresse" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "Dette er ikke en gyldig sti" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "E-postadressen er allerede i bruk" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "Fant ikke e-postadressen \"%(email)s\"" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Skriv inn en gyldig IPv4- eller IPv6-adresse" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1827,8 +1857,9 @@ #: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" -msgstr "Du har administratorrettigheter til denne gruppen, og kan redigere den" -"Du har administratorrettigheter til denne gruppen, og kan redigere den" +msgstr "" +"Du har administratorrettigheter til denne gruppen, og kan redigere denDu " +"har administratorrettigheter til denne gruppen, og kan redigere den" #: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" @@ -1842,24 +1873,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "Beskrivelse" @@ -1876,7 +1913,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1884,11 +1921,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "Eier" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "Logg inn" @@ -1903,7 +1940,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1911,7 +1948,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "Passord" @@ -2073,10 +2110,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Handling" @@ -2126,22 +2165,22 @@ msgstr "Programtillegg" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "Lagre" @@ -2159,14 +2198,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Privat pakkebrønn" #: kallithea/templates/admin/defaults/defaults.html:37 #: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2174,36 +2213,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "Skru på statistikk" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "Skru på nedlastinger" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 msgid "Enable download menu on summary page." msgstr "Skru på nedlastingsmeny på sammendragsside." -#: 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:78 -msgid "Enable locking" -msgstr "Skru på låsing" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2250,8 +2278,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "Aldri" @@ -2284,7 +2314,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2320,23 +2350,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2364,7 +2396,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2424,7 +2456,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "Min konto" @@ -2437,24 +2469,31 @@ msgid "Email Addresses" msgstr "E-postadresser" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +#| msgid "API Keys" +msgid "SSH Keys" +msgstr "API-nøkler" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "API-nøkler" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 msgid "Owned Repositories" msgstr "Eide pakkebrønner" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2481,7 +2520,9 @@ msgstr "Bekreft fjerning av denne API-nøklen: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "Fjern" @@ -2497,12 +2538,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "Legg til" @@ -2603,6 +2646,47 @@ msgid "Name" msgstr "Navn" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "Etternavn" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +#| msgid "Confirm to remove this API key: %s" +msgid "Confirm to remove this SSH key: %s" +msgstr "Bekreft fjerning av denne API-nøklen: %s" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +#| msgid "New API key" +msgid "New SSH key" +msgstr "Ny API-nøkkel" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Pakkebrønner du holder oppsyn med" @@ -2619,7 +2703,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "IP-hvitliste" @@ -2655,7 +2739,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2815,7 +2899,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "Avansert" @@ -2921,17 +3005,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "Fjern denne gruppen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "Bekreft sletting av denne gruppen" @@ -2959,14 +3037,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2976,7 +3054,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -3028,8 +3106,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "Statistikk" @@ -3063,69 +3141,32 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "Lås pakkebrønn" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "Pakkebrønnen er ikke låst" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Denne pakkebrønnen har %s forgrening" msgstr[1] "Denne pakkebrønnen har %s forgreninger" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "Slett forgreninger" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3222,20 +3263,11 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -#, fuzzy -msgid "URL by id" -msgstr "Nettadresse etter ID" - #: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "Permanent URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3245,30 +3277,30 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "Skriv inn brukerens navn" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3378,8 +3410,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "Lagre innstillinger" @@ -3474,10 +3506,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3498,15 +3526,7 @@ msgid "Git path" msgstr "Git-sti" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "Python-pakker" @@ -3515,46 +3535,38 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3603,9 +3615,8 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 #, fuzzy -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "Kloningsnettadresse" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3623,56 +3634,72 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +msgid "SSH Clone URL" +msgstr "Kloningsnettadresse" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Repository page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3833,12 +3860,12 @@ msgstr "Støtte" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Merkurial-pakkebrønn" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Git-pakkebrønn" @@ -3888,160 +3915,135 @@ msgstr "Sammenlign" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Søk" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "Lås opp" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "Lås" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "Følg" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Forgren" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 #, fuzzy msgid "Create Pull Request" msgstr "Opprett flettingsorespørsel" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "Bytt til" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Show recent activity" msgstr "Vis nylig aktivitet" -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/base/base.html:296 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:301 #, fuzzy msgid "Show public gists" msgstr "Vis offentlige Gist-er" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 #, fuzzy msgid "Gists" msgstr "Gist-er" -#: kallithea/templates/base/base.html:313 +#: kallithea/templates/base/base.html:306 msgid "All Public Gists" msgstr "Alle offentlige Gist-er" -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:308 msgid "My Public Gists" msgstr "Mine offentlige Gist-er" -#: kallithea/templates/base/base.html:316 +#: kallithea/templates/base/base.html:309 msgid "My Private Gists" msgstr "Mine private Gist-er" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 #, fuzzy msgid "Search in repositories" msgstr "Søk i pakkebrønner" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "Mine flettingsforespørsler" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "Ikke innlogget" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 #, fuzzy msgid "Login to Your Account" msgstr "Logg in på kontoen din" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "Glemt passordet?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "Mangler du konto?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "Logg ut" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default Permissions" -msgid "default permissions" -msgstr "Forvalgte tilganger" - -#: kallithea/templates/base/default_perms_box.html:23 #, fuzzy msgid "Create repositories" msgstr "Opprett pakkebrønner" -#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/templates/base/default_perms_box.html:15 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4754,7 +4756,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4766,7 +4768,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4818,7 +4820,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4946,8 +4948,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -4998,8 +5000,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5305,9 +5307,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5317,20 +5319,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5339,12 +5341,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5385,94 +5387,143 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +#, fuzzy +msgid "Clone URL" +msgstr "Kloningsnettadresse" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "Etternavn" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" +msgid "Add or upload files directly via Kallithea" msgstr "" #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Denne pakkebrønnen har blitt påst av %s den %s" + +#~ msgid "Repository has been locked" +#~ msgstr "Pakkebrønnen har blitt låst" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Pakkebrønnen har blitt låst opp" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "En feil inntraff under opplåsning" + +#~ msgid "Invalid API key" +#~ msgstr "Ugyldig API-nøkkel" + +#~ msgid "Token mismatch" +#~ msgstr "Symbol stemmer ikke overens" + +#~ msgid "Enable locking" +#~ msgstr "Skru på låsing" + +#~ msgid "Lock Repository" +#~ msgstr "Lås pakkebrønn" + +#~ msgid "Repository is not locked" +#~ msgstr "Pakkebrønnen er ikke låst" + +#, fuzzy +#~ msgid "URL by id" +#~ msgstr "Nettadresse etter ID" + +#~ msgid "Unlock" +#~ msgstr "Lås opp" + +#~ msgid "Lock" +#~ msgstr "Lås" + +#, fuzzy +#~| msgid "Default Permissions" +#~ msgid "default permissions" +#~ msgstr "Forvalgte tilganger" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "Det er ingen indeks å søke i. Kjør en annen whoosh-indekserer"
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,12 +1,11 @@ # Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2017-06-18 16:22+0000\n" "Last-Translator: Thomas De Schampheleire <patrickdepinguin@gmail.com>\n" "Language-Team: Dutch (Belgium) <https://hosted.weblate.org/projects/" @@ -19,14 +18,14 @@ "X-Generator: Weblate 2.15-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Er zijn nog geen changesets" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,47 +34,47 @@ msgid "None" msgstr "Geen" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(gesloten)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Toon witruimtes" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 #, fuzzy msgid "Ignore whitespace" msgstr "Negeer witruimtes" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Vergroot de diff context tot %(num)s lijnen" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy msgid "No permission to change status" msgstr "Selecteer de changeset" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "Deze revisie bestaat niet in deze repository" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 #, fuzzy #| msgid "Cannot compare repositories without using common ancestor" msgid "Cannot compare repositories of different types" @@ -83,64 +82,64 @@ "Kan geen repositories vergelijken zonder een gemeenschappelijke voorouder " "te gebruiken" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 msgid "Cannot show empty diff" msgstr "" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "" "Kan geen repositories vergelijken zonder een gemeenschappelijke voorouder " "te gebruiken" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Geen antwoord" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Ongekende fout" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 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:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Ongeautoriseerde toegang tot resource" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "U hebt geen permissie om deze pagina te bekijken" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "De resource kon niet gevonden worden" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 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:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s committeerde op %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -150,123 +149,117 @@ msgid "Changeset was too big and was cut off..." msgstr "De changeset was te groot en werd afgekort..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s %s feed" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Veranderingen in repository %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 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:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Er zijn nog geen bestanden. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s op %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, 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:311 +#: kallithea/controllers/files.py:296 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:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Bestand %s verwijderd via Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Bestand %s succesvol verwijderd" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Er trad een fout op tijdens het committeren" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 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:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Bestand %s gewijzigd via Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Geen wijzigingen" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Succesvol gecommitteerd naar %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Bestand toegevoegd via Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Geen inhoud" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Geen bestandsnaam" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 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:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Downloads uitgeschakeld" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Ongekende revisie %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Lege repository" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Ongekende archieftype" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Tags" @@ -275,11 +268,11 @@ 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:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Groepen" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -287,177 +280,177 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Branch" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Gesloten branches" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Bladwijzer" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Publiek logboek" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Logboek" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Incorrecte captcha" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "U bent succesvol geregistreerd bij %s" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "Een paswoordherstel bevestigingscode is verzonden" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Ongeldig paswoordherstel token" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Paswoord succesvol aangepast" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Changeset" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Bijzonder" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -473,21 +466,21 @@ msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" @@ -499,123 +492,136 @@ msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 -#: kallithea/controllers/admin/users.py:249 -msgid "5 minutes" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 -#: kallithea/controllers/admin/users.py:250 -msgid "1 hour" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 -#: kallithea/controllers/admin/users.py:251 -msgid "1 day" +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "Successfully deleted file %s" +msgid "SSH key successfully deleted" +msgstr "Bestand %s succesvol verwijderd" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -623,9 +629,9 @@ msgid "Read" msgstr "" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -633,9 +639,9 @@ msgid "Write" msgstr "" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -658,361 +664,346 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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:42 -#: kallithea/templates/base/root.html:50 -msgid "Disabled" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 -msgid "Allowed with manual account activation" +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" msgstr "" #: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:466 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:468 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "" +#: kallithea/controllers/admin/settings.py:357 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + #: kallithea/controllers/admin/settings.py:360 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - -#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1042,219 +1033,219 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "Selecteer de changeset" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1262,69 +1253,96 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "" @@ -1333,133 +1351,133 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1485,302 +1503,314 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "SSH key %r not found" +msgstr "Selecteer de changeset" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1821,24 +1851,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1855,7 +1891,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1863,11 +1899,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1882,7 +1918,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1890,7 +1926,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -2046,10 +2082,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2098,22 +2136,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2131,14 +2169,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2146,36 +2184,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2222,8 +2249,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2256,7 +2285,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2292,23 +2321,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2336,7 +2367,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2396,7 +2427,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2409,24 +2440,29 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 -msgid "API Keys" -msgstr "" - #: kallithea/templates/admin/my_account/my_account.html:29 -msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:30 -#: kallithea/templates/journal/journal.html:33 -msgid "Watched Repositories" +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:32 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:33 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2453,7 +2489,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2469,12 +2507,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2575,6 +2615,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" @@ -2591,7 +2667,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2627,7 +2703,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2787,7 +2863,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2895,17 +2971,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2933,14 +3003,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2950,7 +3020,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -3002,8 +3072,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -3037,69 +3107,32 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3198,19 +3231,11 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "Permanent URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3220,30 +3245,30 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3352,8 +3377,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "" @@ -3448,10 +3473,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3472,15 +3493,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3489,46 +3502,38 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3577,8 +3582,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3596,58 +3600,73 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repositories" msgid "Repository page size" msgstr "Repositories" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3808,12 +3827,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3861,151 +3880,128 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" +msgid "Create repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -msgid "default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4734,7 +4730,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4746,7 +4742,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4799,7 +4795,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4927,8 +4923,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -4979,8 +4975,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5287,9 +5283,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5299,20 +5295,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5321,12 +5317,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5367,95 +5363,102 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 #, fuzzy msgid "Latest Changes" msgstr "Statuswijziging -> %s" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" +msgid "Add or upload files directly via Kallithea" msgstr "" #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Deze repository is gelocket door %s op %s" + #, fuzzy #~| msgid "Empty repository" #~ msgid "Repository Group"
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-08-17 19:53+0000\n" "Last-Translator: Mateusz Mendel <mendelm9@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/kallithea/" @@ -14,19 +13,19 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n" +"%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 3.8\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,92 +34,94 @@ msgid "None" msgstr "Brak" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(zamknięty)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "pokazuj spacje" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignoruj pokazywanie spacji" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy msgid "No permission to change status" msgstr "Brak uprawnień do zmiany statusu" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" -msgstr "Prośba o skasowanie połączenia gałęzi %s została wykonana prawidłowo" - -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +msgstr "" +"Prośba o skasowanie połączenia gałęzi %s została wykonana prawidłowo" + +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "Nie można znaleźć innego repozytorium %s" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:70 -msgid "No response" -msgstr "Brak odpowiedzi" - #: kallithea/controllers/error.py:71 +msgid "No response" +msgstr "Brak odpowiedzi" + +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" -"Żądanie nie może być rozumiane przez serwer z powodu zniekształconej składni." - -#: kallithea/controllers/error.py:87 +"Żądanie nie może być rozumiane przez serwer z powodu zniekształconej " +"składni." + +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "Nie masz uprawnień do przeglądania tej strony" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Zasób nie został znaleziony" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -128,12 +129,12 @@ "Serwer napotkał niespodziewany warunek, który uniemożliwia spełnienie " "żądania." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s zakomitowal w %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -143,122 +144,116 @@ 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:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s %s zasilać" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Zmiany w %s repozytorium" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Kliknij tutaj, by dodać nowy plik" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 msgid "There are no files yet." msgstr "Nie ma jeszcze gałęzi." -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, fuzzy, python-format msgid "%s at %s" msgstr "w %s i %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, 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:311 +#: kallithea/controllers/files.py:296 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "Można tylko usuwać pliki po sprawdzeniu obecnej gałęzi" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 #, 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:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Edytowanie %s w Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Bez zmian" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Dodano %s poprzez Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Brak treści" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Brak nazwy pliku" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 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:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Puste repozytorium" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Różnice" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Gałęzie" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Etykiety" @@ -267,11 +262,11 @@ msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -279,179 +274,179 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repozytoria" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "gałąź" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Zamknięte Gałęzie" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Zakładka" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Dziennik Publiczny" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Dziennik" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Udało Ci się zarejestrować w %s" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "Twój link zresetowania hasła został wysłany" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Nieprawidłowy token resetowania hasła" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (zamknięty)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Grupy zmian" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Specjalne" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "gałęzie" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Zakładki" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Brak opisu" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Połączone gałęzie zaktualizowane" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -467,21 +462,21 @@ msgid "An error occurred during search operation." msgstr "Wystąpił błąd podczas operacji wyszukiwania." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Żadne dane nie zostały załadowane" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Ustawienia autentykacji poprawnie zaktualizowane" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "wystąpił błąd podczas uaktualniania ustawień autentykacji" @@ -493,125 +488,138 @@ 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:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "na zawsze" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 minut" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 godzina" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 dzień" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 miesiąc" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Wystąpił błąd podczas tworzenia gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Usuń gist %s" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Niemodyfikowany" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 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:117 +#: 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:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, 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:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "Dodano e-mail %s do użytkownika" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "Usunięto e-mail użytkownikowi" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "Successfully deleted user" +msgid "SSH key successfully deleted" +msgstr "Użytkownik został usunięty" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -619,9 +627,9 @@ msgid "Read" msgstr "Odczyt" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -629,9 +637,9 @@ msgid "Write" msgstr "Zapis" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -654,363 +662,349 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administracja" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Wyłączone" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Dozwolona z ręczną aktywacją konta" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Dozwolona z automatyczną aktywacją konta" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Włączone" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "Globalne uprawnienia zaktualizowane poprawnie" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Wystąpił błąd podczas aktualizacji uprawnień" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, 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:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Zaktualizowano grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, 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:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, 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:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, 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:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Usunięto grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, 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:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "Nie można cofnąć zezwolenia dla admina jako admin" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "Wystąpił błąd podczas cofania zezwolenia" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Błąd podczas tworzenia repozytorium %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Gałęzi %s w repozytorium %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "Oderwane rozgałęzienie %s" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "Usunięte rozgałęzienia %s" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" -msgstr "Nie można usunąć repozytorium %s nadal zawiera załączniki rozgałęzienia" - -#: kallithea/controllers/admin/repos.py:290 +msgstr "" +"Nie można usunąć repozytorium %s nadal zawiera załączniki rozgałęzienia" + +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "Wystąpił błąd podczas usuwania %s" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Uprawnienia repozytorium zostały zaktualizowane" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Wystąpił błąd podczas tworzenia pola: %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Wystąpił błąd podczas usuwania pola" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Brak rozgałęzienia --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 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:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Brak" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Repozytorium zostało zablokowane" - -#: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Repozytorium zostało odblokowane" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Wystąpił błąd podczas odblokowywania" - -#: kallithea/controllers/admin/repos.py:528 +#: kallithea/controllers/admin/repos.py:490 msgid "Cache invalidation successful" msgstr "Cache wyczyszczony poprawnie" -#: kallithea/controllers/admin/repos.py:532 +#: kallithea/controllers/admin/repos.py:494 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "Aktualizacja ustawień VCS" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, 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:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "Unieważnione %s repozytoria" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:291 +#: 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:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "Hook już istnieje" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Dodano nowy hook" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Utworzono grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, 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:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Zaktualizowano grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, 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:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "Grupa użytkowników została usunięta z powodzeniem" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 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:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "Aktualizacja uprawnień" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" @@ -1040,221 +1034,223 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Dodano ip %s do listy dozwolonych adresów użytkownika" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "Wystąpił błąd podczas zapisywania adresu IP" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 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:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "Nie znaleziono changeset dla %s%s w %s" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "Twoje konto jest wyłączone" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Plik binarny" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 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:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "Nie wykryto zmian" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "Nie znaleziono changeset %s" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "Wyświetl porównanie" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "i" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "%s więcej" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "rewizja" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "nazwa rozgałęzienia %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, fuzzy, python-format msgid "Pull request %s" msgstr "Połączonych gałęzi #%s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "[pobierz] archiwum z repozytorium" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "[komentarz] do zmiany w repozytorium" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[synchronizacja przez Kallithea] z repozytorium" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[pobrano]" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " i %s więcej" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Brak plików" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "nowy plik" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "modyfikuj" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "kasuj" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "zmień nazwę" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1265,7 +1261,34 @@ "zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " "ponownie przeskanować repozytoria" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1273,7 +1296,7 @@ msgstr[1] "%d lata" msgstr[2] "%d lat" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1281,7 +1304,7 @@ msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1289,7 +1312,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dni" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1297,7 +1320,7 @@ msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1305,7 +1328,7 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1313,27 +1336,27 @@ msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "w %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "%s temu" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s i %s temu" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "przed chwilą" @@ -1342,143 +1365,144 @@ msgid "on line %s" msgstr "widziany %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Wymieniony]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "najwyższy poziom" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Administrator Kallithea" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "Użytkownik domyślny ma dostęp do odczytu nowych repozytoriów" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "Użytkownik domyślny ma dostęp do zapisu nowych repozytoriów" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 #, fuzzy msgid "Only admins can create repository groups" msgstr "Tylko admini mogą tworzyć grupy repozytoriów" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 #, fuzzy msgid "Non-admins can create repository groups" msgstr "" "Użytkownicy bez uprawnień administratora mogą tworzyć grupy repozytoriów" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 #, fuzzy msgid "Only admins can create user groups" msgstr "Tylko admini mogą tworzyć grupy użytkowników" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 #, fuzzy msgid "Non-admins can create user groups" msgstr "" "Użytkownicy bez uprawnień administratora mogą tworzyć grupy użytkowników" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 #, fuzzy msgid "Only admins can fork repositories" msgstr "Tylko admini mogą rozgałęziać repozytoria" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 #, fuzzy msgid "Non-admins can fork repositories" -msgstr "Użytkownicy bez uprawnień administratora mogą rozgałęziać repozytoria" - -#: kallithea/model/db.py:1735 +msgstr "" +"Użytkownicy bez uprawnień administratora mogą rozgałęziać repozytoria" + +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "Rejestracja wyłączona" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "Brak Korekty" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "Objęty Przeglądem" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Niezaakceptowano" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Zaakceptowano" @@ -1504,7 +1528,7 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, fuzzy, python-format #| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgid "" @@ -1512,157 +1536,175 @@ "%(branch)s" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "Użytkownik %(new_username)s zarejestrował się" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, 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:171 +#: kallithea/model/notification.py:170 #, 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:184 +#: kallithea/model/notification.py:183 #, fuzzy msgid "Closing" msgstr "Zamykanie" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, 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_nice_id)s: %(pr_title)s" - -#: kallithea/model/pull_request.py:211 +msgstr "" +"%(user)s chce żeby przejrzeć nowe gałęzie %(pr_nice_id)s: %(pr_title)s" + +#: kallithea/model/pull_request.py:209 #, fuzzy #| msgid "Create Pull Request" msgid "Cannot create empty pull request" msgstr "Nie można stworzyć pustego żądania połączenia gałęzi" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 #, fuzzy #| msgid "Confirm to delete this pull request" msgid "You are not authorized to create the pull request" msgstr "Nie masz uprawnień, aby stworzyć żądanie połączenia gałęzi" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "ostatni tip" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Changeset %s not found" +msgid "SSH key %r not found" +msgstr "Nie znaleziono changeset %s" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "nowy użytkownik się zarejestrował" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 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:258 +"Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " +"aplikacji" + +#: kallithea/model/user.py:255 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -"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:263 +"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:260 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups: %s" msgstr "" -"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:270 +"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:267 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -"użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może zostać " -"usunięty. Zmień właściciela lub usuń te grupy użytkowników: %s" - -#: kallithea/model/user.py:364 +"użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " +"zostać usunięty. Zmień właściciela lub usuń te grupy użytkowników: %s" + +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "łącze resetowania hasła" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 #, fuzzy msgid "Password reset notification" msgstr "Powiadomienie o resetowaniu hasła" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "Wartość listy nie może być pusta" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Użytkownik \"%(username)s\" już istnieje" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Nazwa użytkownika \"%(username)s\" nie może być użyta" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or " @@ -1672,25 +1714,25 @@ "kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym lub " "podkreśleniem" -#: kallithea/model/validators.py:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Niewłaściwa nazwa grupy" -#: kallithea/model/validators.py:134 +#: 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:136 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1698,106 +1740,102 @@ "nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, " "kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" -#: kallithea/model/validators.py:176 +#: 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:177 +#: 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:179 +#: 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:235 +#: 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:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Hasła różnią się" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "nieprawidłowa nazwa użytkownika lub hasło" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "Niezgodność tokenu" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Nazwa repozytorium %(repo)s jest zabroniona" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Repozytorium o nazwie %(repo)s już istnieje" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, 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:333 +#: kallithea/model/validators.py:318 #, 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:419 +#: kallithea/model/validators.py:404 #, fuzzy msgid "Invalid repository URL" msgstr "Nieprawidłowy URL repozytorium" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "Fork musi być tego samego typu, jak rodzic" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 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:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "nie masz uprawnień do tworzenia repozytorium w tej lokacji roota" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "Nie masz uprawnień do tworzenia grupy w tym miejscu" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 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:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "Ten adres e-mail jest już zajęty" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "e-mail \"%(email)s\" nie istnieje" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1805,28 +1843,28 @@ "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " "który jest odpowiednikiem \"username\"" -#: kallithea/model/validators.py:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Proszę podać poprawny adres IPv4 lub IPv6" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, 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:765 +#: kallithea/model/validators.py:750 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:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "Nazwa pliku nie może znajdować się w katalogu" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1867,24 +1905,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "Opis" @@ -1901,7 +1945,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1909,11 +1953,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "Właściciel" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "Zaloguj się" @@ -1928,7 +1972,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1936,7 +1980,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "Hasło" @@ -1992,8 +2036,8 @@ "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 znajdujący się w " -"systemie." +"Link do zresetowania hasła zostanie wysłany na adres e-mail znajdujący " +"się w systemie." #: kallithea/templates/password_reset_confirmation.html:23 #, python-format @@ -2096,10 +2140,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Działanie" @@ -2148,22 +2194,22 @@ msgstr "Wtyczka" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "Zapisz" @@ -2181,14 +2227,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Prywatne repozytorium" #: kallithea/templates/admin/defaults/defaults.html:37 #: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2198,36 +2244,25 @@ "jako współpracownicy." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "Włącz statystyki" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "Włącz okno statystyk na stronie podsumowania." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "Włącz pobieranie" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 msgid "Enable download menu on summary page." msgstr "Włącz menu pobierania na stronie podsumowania." -#: 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:78 -msgid "Enable locking" -msgstr "Włącz blokowanie" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "Włącz blokowanie pobierania w repozytorium." - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2274,8 +2309,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "nigdy" @@ -2308,7 +2345,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "Utwórz Nowy Gist" @@ -2344,23 +2381,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2388,7 +2427,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2448,7 +2487,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "Moje konto" @@ -2461,24 +2500,29 @@ msgid "Email Addresses" msgstr "Adresy e-mail" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 msgid "Owned Repositories" msgstr "Posiadane repozytoria" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "Obserwowane repozytoria" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 #, fuzzy msgid "Show Permissions" msgstr "Pokaż uprawnienia" @@ -2506,7 +2550,9 @@ msgstr "Potwierdź, aby usunąć to ip: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "Usuń" @@ -2524,12 +2570,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "Dodaj" @@ -2630,6 +2678,47 @@ msgid "Name" msgstr "Nazwa" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "Nazwisko" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "Potwierdź, aby usunąć to ip: %s" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +msgid "New SSH key" +msgstr "Nowe pole klucza API" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public Gist" +msgid "Public key" +msgstr "Publiczny Gist" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Repozytoria które obserwujesz" @@ -2646,7 +2735,7 @@ msgstr "Globalne" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "Lista dozwolonych adresów IP" @@ -2685,7 +2774,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2720,9 +2809,9 @@ "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -"Wszystkie Uprawnienia domyślne każdej grupy użytkowników zostaną przywrócone " -"do wybranego zezwolenia, trzeba pamiętać, że wszystkie niestandardowe " -"uprawnienia domyślne dla grup repozytorium zostaną utracone" +"Wszystkie Uprawnienia domyślne każdej grupy użytkowników zostaną " +"przywrócone do wybranego zezwolenia, trzeba pamiętać, że wszystkie " +"niestandardowe uprawnienia domyślne dla grup repozytorium zostaną utracone" #: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" @@ -2852,7 +2941,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "Zaawansowane" @@ -2969,20 +3058,12 @@ "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 "" -"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:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 #, fuzzy msgid "Remove this group" msgstr "Usuń tę grupę użytkowników" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 #, fuzzy msgid "Confirm to delete this group" msgstr "Potwierdź usunięcie grupy użytkowników" @@ -3015,7 +3096,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3023,7 +3104,7 @@ "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:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." @@ -3033,7 +3114,7 @@ msgstr "Rodzaj repozytorium do stworzenia." #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Docelowa rewizja" @@ -3086,8 +3167,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "Statystyki" @@ -3128,60 +3209,18 @@ "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla " "wszystkich w dzienniku publicznym." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -#, fuzzy -msgid "Change Locking" -msgstr "Włącz blokowanie" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -#, fuzzy -msgid "Confirm to unlock repository." -msgstr "Potwierdź odblokowanie repozytorium." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -#, fuzzy -msgid "Unlock Repository" -msgstr "Odblokuj repozytorium" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, fuzzy -msgid "Confirm to lock repository." -msgstr "Potwierdź blokowanie repozytorium." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -#, fuzzy -msgid "Lock Repository" -msgstr "Zablokuj repozytorium" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "Repozytorium nie jest zablokowane" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Potwierdź usunięcie repozytorium: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #, fuzzy msgid "Delete this Repository" msgstr "Usuń to repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3189,15 +3228,15 @@ msgstr[1] "to repozytorium ma %s forki" msgstr[2] "to repozytorium ma %s forków" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "Ustaw jako rozwidlenie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "Usuń rozwidlenie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3215,8 +3254,8 @@ "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" -"Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym dostępie " -"do repozytorium zostanie dodane do bufora ponownie." +"Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym " +"dostępie do repozytorium zostanie dodane do bufora ponownie." #: kallithea/templates/admin/repos/repo_edit_caches.html:9 #, fuzzy @@ -3306,20 +3345,12 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#, fuzzy -msgid "Permanent Repository ID" +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#, fuzzy +msgid "Permanent URL" msgstr "Stałe ID repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3329,32 +3360,32 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy msgid "Remote repository" msgstr "Zdalne repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 #, fuzzy msgid "Repository URL" msgstr "URL Repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 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:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "Zmiana właściciela tego repozytorium." @@ -3467,8 +3498,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 #, fuzzy msgid "Save Settings" msgstr "Zapisz ustawienia" @@ -3569,10 +3600,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3594,15 +3621,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3611,42 +3630,34 @@ msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "Logi poleceń wysłania zmian użytkowników" +msgid "Update repository after push (hg update)" +msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "Logi poleceń połączenia gałęzi użytkowników" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 #, fuzzy msgid "Mercurial extensions" msgstr "Rozszerzenia Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "Rozszerzenia dużych plików" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "Rozszerzenia hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 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/templates/admin/settings/settings_vcs.html:47 #, fuzzy msgid "Location of repositories" msgstr "Położenie repozytoriów" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect." @@ -3654,7 +3665,7 @@ "Kliknij, aby odblokować. Musisz ponownie uruchomić Kallithea żeby " "wprowadzić to ustawienie w życie." -#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3704,9 +3715,8 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -#, fuzzy -msgid "Clone URL" +#, fuzzy +msgid "HTTP Clone URL" msgstr "URL klonowania" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3724,60 +3734,76 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +msgid "SSH Clone URL" +msgstr "URL klonowania" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repository Size" msgid "Repository page size" msgstr "Rozmiar Repozytorium" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "Ikony" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 #, fuzzy msgid "Show public/private icons next to repository names." msgstr "Pokazuj ikonę publiczne/prywatne repo w repozytoriach." -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 #, fuzzy msgid "Meta Tagging" msgstr "Tagowanie meta" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3941,12 +3967,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Repozytorium mercurial" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Repozytorium git" @@ -3996,168 +4022,142 @@ msgstr "Porównaj" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Szukaj" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "Odblokowany" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "zablokowane" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "Obserwuj" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "Nie obserwuj" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Gałąź" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "Przełącz do" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Show recent activity" msgstr "Pokaż ostatnią aktywność" +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/base/base.html:296 +msgid "Public journal" +msgstr "Dziennik publiczny" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" +msgstr "Wyświetl publiczne gists" + #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" -msgstr "Dziennik publiczny" - -#: kallithea/templates/base/base.html:308 -msgid "Show public gists" -msgstr "Wyświetl publiczne gists" - -#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:313 +#: kallithea/templates/base/base.html:306 #, fuzzy msgid "All Public Gists" msgstr "Wszystkie publiczne gists" -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:308 #, fuzzy msgid "My Public Gists" msgstr "Moje publiczne gists" -#: kallithea/templates/base/base.html:316 +#: kallithea/templates/base/base.html:309 #, fuzzy msgid "My Private Gists" msgstr "Moje prywatne gists" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "Moje połączone gałęzie" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 #, fuzzy msgid "Not Logged In" msgstr "Niezalogowany" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 #, fuzzy msgid "Login to Your Account" msgstr "Zaloguj się do swojego konta" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "Nie pamiętasz hasła?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "Nie masz konta?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "Wyloguj się" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "Dziedziczenie domyślne" +msgid "Create repositories" +msgstr "Utwórz repozytorium" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "Domyślne uprawnienia" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "Utwórz repozytorium" - -#: kallithea/templates/base/default_perms_box.html:27 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:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 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:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "Rozwidlenie repozytorium" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" "Wybierz tę opcję, aby umożliwić rozwidlania repozytorium dla tego " @@ -4939,7 +4939,7 @@ msgstr "%s Pliki różnic" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "Pliki %s" @@ -4951,7 +4951,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -5005,7 +5005,7 @@ msgstr "Wczytywanie listy plików..." #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "Rozmiar" @@ -5142,8 +5142,8 @@ msgstr "Obserwatorzy %s" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "Obserwuje" @@ -5164,7 +5164,8 @@ #, fuzzy msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -"Wersja domyślna dla plików stronicowania, pobierania plików, whoosh i readme." +"Wersja domyślna dla plików stronicowania, pobierania plików, whoosh i " +"readme." #: kallithea/templates/forks/fork.html:58 msgid "Private" @@ -5196,8 +5197,8 @@ msgstr "Gałąź %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "Gałęzie" @@ -5524,9 +5525,9 @@ msgid "File names" msgstr "Nazwy plików" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Brak uprawnień" @@ -5536,20 +5537,20 @@ msgstr "%s Statystyki" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "%s RSS" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "Włącz" @@ -5558,12 +5559,12 @@ msgstr "Statystyki zebrane: " #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "pliki" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "Pokaż więcej" @@ -5604,98 +5605,189 @@ msgid "%s Summary" msgstr "Podsumowanie %s" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "Repozytorium zablokowane przez %s" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "Repozytorium odblokowane" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "Gałąź z" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "Klonuj z" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "Pokaż ID" - +#: kallithea/templates/summary/summary.html:54 +#, fuzzy +msgid "Clone URL" +msgstr "URL klonowania" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "Pokaż nazwę" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "Nazwisko" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "Statystyki" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "Pobierz" -#: kallithea/templates/summary/summary.html:101 +#: kallithea/templates/summary/summary.html:109 msgid "There are no downloads yet" msgstr "Nie pobrano jeszcze plików" -#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:111 msgid "Downloads are disabled for this repository" msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" -#: kallithea/templates/summary/summary.html:109 +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "Pobierz jako zip" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 #, fuzzy msgid "With subrepos" msgstr "z subrepozytorium" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "Kanał RSS" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 #, fuzzy msgid "Latest Changes" msgstr "Ostatnie zmiany" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 #, fuzzy msgid "Quick Start" msgstr "Szybki start" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "Wyślij zmiany do nowego repo" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "Istniejące repozytorium?" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "Pobierz %s jak %s" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Repozytorium zostało zablokowane przez %s na %s" + +#~ msgid "Repository has been locked" +#~ msgstr "Repozytorium zostało zablokowane" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Repozytorium zostało odblokowane" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Wystąpił błąd podczas odblokowywania" + +#~ msgid "Token mismatch" +#~ msgstr "Niezgodność tokenu" + +#~ msgid "Enable locking" +#~ msgstr "Włącz blokowanie" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "Włącz blokowanie pobierania w repozytorium." + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "" +#~ "Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do " +#~ "wszystkich innych grup i repozytoriów wewnątrz" + +#, fuzzy +#~ msgid "Change Locking" +#~ msgstr "Włącz blokowanie" + +#, fuzzy +#~ msgid "Confirm to unlock repository." +#~ msgstr "Potwierdź odblokowanie repozytorium." + +#, fuzzy +#~ msgid "Unlock Repository" +#~ msgstr "Odblokuj repozytorium" + +#, fuzzy +#~ msgid "Confirm to lock repository." +#~ msgstr "Potwierdź blokowanie repozytorium." + +#, fuzzy +#~ msgid "Lock Repository" +#~ msgstr "Zablokuj repozytorium" + +#~ msgid "Repository is not locked" +#~ msgstr "Repozytorium nie jest zablokowane" + +#~ msgid "Log user push commands" +#~ msgstr "Logi poleceń wysłania zmian użytkowników" + +#~ msgid "Log user pull commands" +#~ msgstr "Logi poleceń połączenia gałęzi użytkowników" + +#~ msgid "Unlock" +#~ msgstr "Odblokowany" + +#~ msgid "Lock" +#~ msgstr "zablokowane" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "Dziedziczenie domyślne" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "Domyślne uprawnienia" + +#~ msgid "Repository locked by %s" +#~ msgstr "Repozytorium zablokowane przez %s" + +#~ msgid "Repository unlocked" +#~ msgstr "Repozytorium odblokowane" + +#~ msgid "Show by ID" +#~ msgstr "Pokaż ID" + +#~ msgid "Show by Name" +#~ msgstr "Pokaż nazwę" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" @@ -5928,9 +6020,6 @@ #~ msgid "invalid user name" #~ msgstr "niepoprawna nazwa użytkownika" -#~ msgid "Your account is disabled" -#~ msgstr "Twoje konto jest wyłączone" - #~ msgid "invalid clone URL" #~ msgstr "nieprawidłowe url klonowania"
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: Marcin Kuźmiński <marcin@python-works.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" @@ -17,14 +16,14 @@ "Plural-Forms: nplurals=2; plural=(n > 1)\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -33,95 +32,95 @@ msgid "None" msgstr "Nenhum" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(fechado)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Mostrar espaços em branco" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorar espaços em branco" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy msgid "No permission to change status" msgstr "Vote para estado do pull request" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, 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:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 #, fuzzy msgid "No response" msgstr "revisões" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 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:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Acesso não autorizado ao recurso" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 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:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "O recurso não pôde ser encontrado" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -129,12 +128,12 @@ "O servidor encontrou uma condição inesperada que o impediu de satisfazer " "a requisição." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s commitados em %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -144,123 +143,117 @@ msgid "Changeset was too big and was cut off..." msgstr "Conjunto de mudanças era grande demais e foi cortado..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s - feed %s" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Modificações no repositório %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Clique aqui para adicionar um novo arquivo" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no forks yet" msgid "There are no files yet." msgstr "Ainda não há bifurcações" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, fuzzy, python-format msgid "%s at %s" msgstr "em %s e %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, 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:311 +#: kallithea/controllers/files.py:296 #, 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:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 #, 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:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Arquivo %s editado via Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Sem modificações" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Arquivo adicionado via Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Nenhum conteúdo" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Nenhum nome de arquivo" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 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:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Downloads desabilitados" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Repositório vazio" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Tipo de arquivo desconhecido" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Ramos" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Etiquetas" @@ -269,11 +262,11 @@ msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -281,184 +274,184 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repositórios" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Ramo" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Ramos Fechados" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Diário Público" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Diário" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Você foi registrado no %s com sucesso" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 #, fuzzy msgid "A password reset confirmation code has been sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 #, fuzzy msgid "Invalid password reset token" msgstr "Link para trocar senha" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Conjunto de Mudanças" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Ramos pares" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 #, fuzzy msgid "Error occurred while creating pull request" msgstr "Ocorreu um erro durante o envio do pull request" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Novo pull request criado com sucesso" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Revisores do pull request" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 #, fuzzy msgid "No description" msgstr "Descrição" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 #, fuzzy msgid "Pull request updated" msgstr "Pull requests para %s" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -475,22 +468,22 @@ msgid "An error occurred during search operation." msgstr "Ocorreu um erro durante essa operação de busca" -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 #, fuzzy msgid "No data ready yet" msgstr "Ainda não há dados carregados" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" @@ -502,126 +495,139 @@ 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:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 #, fuzzy msgid "Forever" msgstr "para sempre" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "cinco minutos" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "uma hora" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "um dia" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "um mês" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Ocorreu um erro durante a criação de um gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Gist %s excluído" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 #, fuzzy msgid "Unmodified" msgstr "Última alteração" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 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:117 +#: 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:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, 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:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "Email %s adicionado ao usuário" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante o salvamento do email" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "Email removido do usuário" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "Successfully deleted user" +msgid "SSH key successfully deleted" +msgstr "Usuário excluído com sucesso" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -629,9 +635,9 @@ msgid "Read" msgstr "Ler" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -639,9 +645,9 @@ msgid "Write" msgstr "Gravar" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -664,368 +670,351 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administrador" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Desabilitado" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Permitido com ativação manual de conta" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 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:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Habilitado" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Ocorreu um erro durante a atualização das permissões" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, 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:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Grupo de repositórios %s atualizado" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, 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:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, 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:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, 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:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Grupo de repositórios %s excluído" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, 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:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 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:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "Ocorreu um erro durante a revocação das permissões" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Erro ao criar repositório %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, 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:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "%s bifurcações excluídas" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Repositório %s excluído" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, 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:290 +#: kallithea/controllers/admin/repos.py:289 #, 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:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante a remoção do campo" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 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:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Nada" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, 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:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -#, fuzzy -msgid "Repository has been locked" -msgstr "Repositório não está travado" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -#, fuzzy -msgid "Repository has been unlocked" -msgstr "Repositório não está travado" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Ocorreu um erro durante o destravamento" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 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:579 +#: kallithea/controllers/admin/repos.py:541 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:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "Configurações de VCS atualizadas" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 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:180 +#: kallithea/controllers/admin/settings.py:176 #, 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:192 +#: kallithea/controllers/admin/settings.py:188 #, 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:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: kallithea/controllers/admin/settings.py:291 +#: 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:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy msgid "Hook already exists" msgstr "Ainda não há dados carregados" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Grupo de usuários %s criado" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, 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:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Grupo de usuários %s atualizado" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, 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:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "Grupo de usuários excluído com sucesso" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 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:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "O grupo destino não pode ser o mesmo" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "Permissões atualizadas" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante o salvamento das permissões" @@ -1055,223 +1044,225 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "Ocorreu um erro durante o salvamento do IP" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 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:852 +#: kallithea/lib/auth.py:712 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:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, 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:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "Sua conta está desabilitada" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Arquivo binário" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 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:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "Excluído ramo: %s" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "Tag criada: %s" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "Conjunto de alterações não encontrado" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 #, fuzzy msgid "Compare view" msgstr "comparar exibir" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "e" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "%s mais" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "revisões" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, fuzzy, python-format msgid "Fork name %s" msgstr "nome da bifurcação %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, fuzzy, python-format msgid "Pull request %s" msgstr "Pull request #%s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "repositório [criado]" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "[baixado] archive do repositório" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "[excluir] repositório" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "usuário [criado]" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "usuário [atualizado]" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "[criado] grupo de usuários" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "[atualizado] grupo de usuários" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "[comentado] em revisão no repositório" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "[comentado] no pull request para" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "[fechado] pull request para" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[realizado push] para" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[commitado via Kallithea] no repositório" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[pulled do remote] no repositório" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " e mais %s" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Nenhum arquivo" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "novo arquivo" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "excluir" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "renomear" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1282,69 +1273,96 @@ "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:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "em %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "%s atrás" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "em %s e %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "agora há pouco" @@ -1353,147 +1371,147 @@ msgid "on line %s" msgstr "na linha %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Menção]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "nível superior" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Administrador do Kallithea" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 #, fuzzy msgid "Default user has write access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 #, fuzzy msgid "Only admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 #, fuzzy msgid "Only admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 #, fuzzy msgid "Non-admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 #, fuzzy msgid "Only admins can fork repositories" msgstr "Criar repositórios" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "Registro desatilitado" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 #, fuzzy msgid "User registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 #, fuzzy msgid "User registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 #, fuzzy msgid "Not reviewed" msgstr "Não Revisado" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 #, fuzzy msgid "Under review" msgstr "Sob Revisão" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Aprovado" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Aprovado" @@ -1519,7 +1537,7 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, fuzzy, python-format #| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgid "" @@ -1527,95 +1545,111 @@ "%(branch)s" msgstr "[comentado] no pull request para" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "O username \"%(new_username)s\" não é válido" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, 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:171 +#: kallithea/model/notification.py:170 #, 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:184 +#: kallithea/model/notification.py:183 #, fuzzy msgid "Closing" msgstr "Usando" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, 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/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| msgid "Create Pull Request" msgid "Cannot create empty pull request" msgstr "Criar Pull Request" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 #, 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 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "tip mais recente" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "SSH key %r not found" +msgstr "Conjunto de alterações não encontrado" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "Novo registro de usuário" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 #, fuzzy msgid "" "You can't remove this user since it is crucial for the entire application" @@ -1623,7 +1657,7 @@ "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1632,7 +1666,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:263 +#: kallithea/model/user.py:260 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " @@ -1641,7 +1675,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:270 +#: kallithea/model/user.py:267 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1650,37 +1684,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:364 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "Link para trocar senha" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 #, fuzzy msgid "Password reset notification" msgstr "Link para trocar senha" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "O valor não pode ser uma lista vazia" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "O username \\\"%(username)s\\\" já existe" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "O username \"%(username)s\" não é válido" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or " @@ -1689,25 +1723,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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "O username \"%(username)s\" não é válido" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Nome inválido de grupo de usuários" -#: kallithea/model/validators.py:134 +#: 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:136 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1716,107 +1750,103 @@ "underscores, pontos ou hífens, e deve começar om um caractere alfa-" "numérico" -#: kallithea/model/validators.py:176 +#: 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:177 +#: 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:179 +#: 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:235 +#: 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:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "senha inválida" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "Descompasso de Token" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, 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:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Um repositório chamado %(repo)s já existe" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, 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:333 +#: kallithea/model/validators.py:318 #, 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:419 +#: kallithea/model/validators.py:404 #, fuzzy msgid "Invalid repository URL" msgstr "repositório privado" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 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:460 +#: kallithea/model/validators.py:445 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:462 +#: kallithea/model/validators.py:447 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:512 +#: kallithea/model/validators.py:497 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:552 +#: kallithea/model/validators.py:537 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:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 #, fuzzy msgid "This email address is already in use" msgstr "Esse endereço de e-mail já está tomado" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "o e-mail \"%(email)s\" não existe." -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1824,26 +1854,26 @@ "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:731 +#: kallithea/model/validators.py:716 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:732 +#: kallithea/model/validators.py:717 #, 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:765 +#: kallithea/model/validators.py:750 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:779 +#: kallithea/model/validators.py:764 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:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1884,24 +1914,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "Descrição" @@ -1918,7 +1954,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1926,11 +1962,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "Dono" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "Entrar" @@ -1945,7 +1981,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1953,7 +1989,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "Senha" @@ -2118,10 +2154,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Ação" @@ -2170,22 +2208,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "Salvar" @@ -2204,14 +2242,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Repositório privado" #: kallithea/templates/admin/defaults/defaults.html:37 #: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2221,36 +2259,25 @@ "adicionadas como colaboradores." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "Habilitar estatísticas" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 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:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "Habilitar downloads" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 msgid "Enable download menu on summary page." msgstr "Habilitar menu de descarregar na página de sumário." -#: 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:78 -msgid "Enable locking" -msgstr "Habilitar travas" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "Habilitar trava-por-pulling no repositório." - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2297,8 +2324,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 #, fuzzy msgid "Never" msgstr "nunca" @@ -2332,7 +2361,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2368,23 +2397,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2412,7 +2443,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2472,7 +2503,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "Minha Conta" @@ -2486,26 +2517,31 @@ msgid "Email Addresses" msgstr "Novo endereço de email" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 #, fuzzy msgid "Owned Repositories" msgstr "repositórios" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Criar repositórios" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 #, fuzzy msgid "Show Permissions" msgstr "Copiar permissões" @@ -2534,7 +2570,9 @@ msgstr "Confirme para excluir este IP: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 #, fuzzy msgid "Remove" msgstr "Removido" @@ -2552,12 +2590,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "Adicionar" @@ -2661,6 +2701,47 @@ msgid "Name" msgstr "Nome" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "Último Nome" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "Confirme para excluir este IP: %s" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +msgid "New SSH key" +msgstr "Próxima chave de campo" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public repository" +msgid "Public key" +msgstr "Repositório público" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 #, fuzzy msgid "Repositories You are Watching" @@ -2679,7 +2760,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2721,7 +2802,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2891,7 +2972,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -3007,20 +3088,12 @@ "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 "" -"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:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 #, fuzzy msgid "Remove this group" msgstr "Criar grupos de usuários" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 #, fuzzy msgid "Confirm to delete this group" msgstr "Confirme para excluir este grupo de usuário: %s" @@ -3053,7 +3126,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3062,7 +3135,7 @@ "longas." #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." @@ -3072,7 +3145,7 @@ msgstr "Tipo de repositório a criar." #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Revisão de pouso" @@ -3125,8 +3198,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "Estatísticas" @@ -3169,75 +3242,33 @@ "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:42 -#, fuzzy -msgid "Change Locking" -msgstr "Habilitar travas" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -#, fuzzy -msgid "Confirm to unlock repository." -msgstr "Confirme para destravar repositório" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -#, fuzzy -msgid "Unlock Repository" -msgstr "Repositório público" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, fuzzy -msgid "Confirm to lock repository." -msgstr "Confirme para travar repositório" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -#, fuzzy -msgid "Lock Repository" -msgstr "Repositório público" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "Repositório não está travado" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #, fuzzy msgid "Delete this Repository" msgstr "[excluir] repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "Desassociar bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "Excluir bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3346,20 +3377,12 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#, fuzzy -msgid "Permanent Repository ID" +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#, fuzzy +msgid "Permanent URL" msgstr "repositório privado" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3369,32 +3392,32 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy msgid "Remote repository" msgstr "repositório [criado]" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 #, fuzzy msgid "Repository URL" msgstr "Repositório" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 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:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." @@ -3507,8 +3530,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 #, fuzzy msgid "Save Settings" msgstr "Salvar configurações" @@ -3609,10 +3632,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3634,15 +3653,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3651,42 +3662,34 @@ msgstr "Mostrar tamanho do repositório após o push" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "Armazenar registro de comandos de push dos usuários" +msgid "Update repository after push (hg update)" +msgstr "Atualizar repositório após realizar push (hg update)" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "Armazenar registro de comandos de pull dos usuários" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "Atualizar repositório após realizar push (hg update)" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 #, fuzzy msgid "Mercurial extensions" msgstr "Extensões do Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "Habilitar extensão largefiles" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "Habilitar extensão hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 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/templates/admin/settings/settings_vcs.html:47 #, fuzzy msgid "Location of repositories" msgstr "Criar repositórios" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect." @@ -3694,7 +3697,7 @@ "Clique para destravar. Você deve reiniciar o Kallithea para que esta " "configuração tenha efeito." -#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3743,9 +3746,8 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -#, fuzzy -msgid "Clone URL" +#, fuzzy +msgid "HTTP Clone URL" msgstr "URL de clonagem" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3763,60 +3765,76 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +msgid "SSH Clone URL" +msgstr "URL de clonagem" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repository Size" msgid "Repository page size" msgstr "Tamanho do Repositório" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "Ícones" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 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:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "Mostrar ícone de repositório privado nos repositórios" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 #, 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:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 #, fuzzy msgid "Meta Tagging" msgstr "Meta-Tagging" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3980,12 +3998,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Repositório Mercurial" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Repositório Git" @@ -4035,168 +4053,142 @@ msgstr "Compare" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Pesquisar" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "Destravar" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "Travar" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "Seguir" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "Parar de seguir" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Bifurcação" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "Trocar Para" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Show recent activity" msgstr "Mostrar atividade recente" +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/base/base.html:296 +msgid "Public journal" +msgstr "Diário público" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" +msgstr "Mostrar gists públicos" + #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" -msgstr "Diário público" - -#: kallithea/templates/base/base.html:308 -msgid "Show public gists" -msgstr "Mostrar gists públicos" - -#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:313 +#: kallithea/templates/base/base.html:306 #, fuzzy msgid "All Public Gists" msgstr "Todos os gists públicos" -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:308 #, fuzzy msgid "My Public Gists" msgstr "Meus gists públicos" -#: kallithea/templates/base/base.html:316 +#: kallithea/templates/base/base.html:309 #, fuzzy msgid "My Private Gists" msgstr "Meus gists privados" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "Buscar nos repositórios" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "Pull requests" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 #, fuzzy msgid "Not Logged In" msgstr "Não logado" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 #, fuzzy msgid "Login to Your Account" msgstr "Entrar com sua conta" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "Esqueceu a senha ?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "Não possui uma conta ?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "Sair" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "Padrões de repositórios" +msgid "Create repositories" +msgstr "Criar repositórios" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "Permissões padrão" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "Criar repositórios" - -#: kallithea/templates/base/default_perms_box.html:27 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:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "Criar grupos de usuários" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 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:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "Bufurcar repositórios" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 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 " @@ -4973,7 +4965,7 @@ msgstr "%s Diff de Arquivo" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "%s Arquivos" @@ -4985,7 +4977,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -5039,7 +5031,7 @@ msgstr "Carregando lista de arquivos..." #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "Tamanho" @@ -5175,8 +5167,8 @@ msgstr "%s Seguidores" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "Seguidores" @@ -5228,8 +5220,8 @@ msgstr "%s Bifurcações" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "Bifurcações" @@ -5557,9 +5549,9 @@ msgid "File names" msgstr "Nomes dos arquivos" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Permissão negada" @@ -5569,20 +5561,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM feed" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "%s RSS feed" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "Habilitar" @@ -5591,12 +5583,12 @@ msgstr "Estatísticas coletadas:" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "arquivos" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "Mostrar mais" @@ -5637,98 +5629,191 @@ msgid "%s Summary" msgstr "%s Sumário" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "Repositório travado por %s" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "Repositório destravado" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "Bifurcação de" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "Clonar de" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "Mostrar por ID" - +#: kallithea/templates/summary/summary.html:54 +#, fuzzy +msgid "Clone URL" +msgstr "URL de clonagem" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "Mostrar por Nome" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "Último Nome" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "Tendências em arquivos" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "Download" -#: kallithea/templates/summary/summary.html:101 +#: kallithea/templates/summary/summary.html:109 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:111 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: kallithea/templates/summary/summary.html:109 +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "Download como zip" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "Marque isto para descarregar arquivo com subrepositórios" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 #, fuzzy msgid "With subrepos" msgstr "com subrepositórios" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "Feed" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 #, fuzzy msgid "Latest Changes" msgstr "Mudanças mais recentes" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 #, fuzzy msgid "Quick Start" msgstr "Início rápido" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "Adicionar ou enviar arquivos diretamente pelo Kallithea" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "Fazer push de novo repositório" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "Repositório existente?" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Este repositório foi travado por %s em %s" + +#, fuzzy +#~ msgid "Repository has been locked" +#~ msgstr "Repositório não está travado" + +#, fuzzy +#~ msgid "Repository has been unlocked" +#~ msgstr "Repositório não está travado" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Ocorreu um erro durante o destravamento" + +#~ msgid "Token mismatch" +#~ msgstr "Descompasso de Token" + +#~ msgid "Enable locking" +#~ msgstr "Habilitar travas" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "Habilitar trava-por-pulling no repositório." + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "" +#~ "Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos " +#~ "os outros grupos e repositórios dentro deles" + +#, fuzzy +#~ msgid "Change Locking" +#~ msgstr "Habilitar travas" + +#, fuzzy +#~ msgid "Confirm to unlock repository." +#~ msgstr "Confirme para destravar repositório" + +#, fuzzy +#~ msgid "Unlock Repository" +#~ msgstr "Repositório público" + +#, fuzzy +#~ msgid "Confirm to lock repository." +#~ msgstr "Confirme para travar repositório" + +#, fuzzy +#~ msgid "Lock Repository" +#~ msgstr "Repositório público" + +#~ msgid "Repository is not locked" +#~ msgstr "Repositório não está travado" + +#~ msgid "Log user push commands" +#~ msgstr "Armazenar registro de comandos de push dos usuários" + +#~ msgid "Log user pull commands" +#~ msgstr "Armazenar registro de comandos de pull dos usuários" + +#~ msgid "Unlock" +#~ msgstr "Destravar" + +#~ msgid "Lock" +#~ msgstr "Travar" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "Padrões de repositórios" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "Permissões padrão" + +#~ msgid "Repository locked by %s" +#~ msgstr "Repositório travado por %s" + +#~ msgid "Repository unlocked" +#~ msgstr "Repositório destravado" + +#~ msgid "Show by ID" +#~ msgstr "Mostrar por ID" + +#~ msgid "Show by Name" +#~ msgstr "Mostrar por Nome" + #~ 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" @@ -5951,9 +6036,6 @@ #~ msgid "invalid user name" #~ msgstr "nome de usuário inválido" -#~ msgid "Your account is disabled" -#~ msgstr "Sua conta está desabilitada" - #~ msgid "invalid clone URL" #~ msgstr "URL de clonagem inválida"
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2017-01-05 14:58+0000\n" "Last-Translator: Andrej Shadura <andrew@shadura.me>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/kallithea/" @@ -19,14 +18,14 @@ "X-Generator: Weblate 2.11-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Ещё не было изменений" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,107 +34,107 @@ msgid "None" msgstr "Ничего" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(закрыто)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Отображать пробелы" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Игнорировать пробелы" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Увеличить контекст до %(num)s строк" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permissions defined yet" msgid "No permission to change status" msgstr "Привилегии еще не назначены" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "Нет такой ревизии в этом репозитории" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, fuzzy, python-format #| msgid "Go to tip of repository" msgid "Could not find other repository %s" msgstr "Перейти на верхушку репозитория" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 #, fuzzy #| msgid "Cannot compare repositories without using common ancestor" msgid "Cannot compare repositories of different types" msgstr "Невозможно сравнивать репозитории без общего предка" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 msgid "Cannot show empty diff" msgstr "" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "Невозможно сравнивать репозитории без общего предка" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Нет ответа" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Неизвестная ошибка" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "Запрос не распознан сервером из-за неправильного синтаксиса." -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Несанкционированный доступ к ресурсу" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "У вас нет прав для просмотра этой страницы" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Ресурс не найден" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" "Сервер не может выполнить запрос из-за неправильного условия в запросе." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s выполнил коммит в %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -145,126 +144,120 @@ msgid "Changeset was too big and was cut off..." msgstr "Изменения оказались слишком большими и были вырезаны..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "Лента новостей %s %s" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Изменения в репозитории %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Нажмите чтобы добавить новый файл" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Нет файлов. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Репозиторий заблокировал %s в %s" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "" "Вы можете удалять файлы только в ревизии, связанной с существующей веткой " -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s удалён с помощью Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s удалён" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Во время коммита произошла ошибка" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" "Вы можете редактировать файлы только в ревизии, связанной с существующей " "веткой " -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s отредактирован с помощью Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Без изменений" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Изменения применены в %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Файл добавлен с помощью Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Пусто" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Безымянный" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Расположение должно быть относительным путем, и не должно содержать \".." "\" в пути" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Возможность скачивать отключена" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Неизвестная ревизия %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Пустой репозиторий" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Неизвестный тип архива" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Набор изменений" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Ветки" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Метки" @@ -273,11 +266,11 @@ msgid "An error occurred during repository forking %s" msgstr "Произошла ошибка во время создания форка репозитория %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Группы" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -285,186 +278,186 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Репозитории" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Ветка" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Закрытые ветки" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Тэги" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Закладки" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Публичный журнал" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Неверная капча" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Регистрация в %s прошла успешно" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "Код для сброса пароля отправлена" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Неверный код сброса пароля" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Пароль обновлён" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (закрыта)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Изменения" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Специальный" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Ветки участника" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Закладки" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Ошибка при создании pull-запроса: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Произошла ошибка при создании pull-запроса" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Pull-запрос создан успешно" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Обновление для pull-запроса создано" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Нет описания" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Pull-запрос обновлён" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, fuzzy, python-format #| msgid "Changeset for %s %s not found in %s" msgid "Revision %s not found in %s" msgstr "Набор изменений не найден" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, 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:522 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Этот pull-запрос уже принят на ветку %s." -#: kallithea/controllers/pullrequests.py:524 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Этот pull-запрос был закрыт и не может быть обновлён." +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 #, 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:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Внимание: Ветка %s имеет ещё одну верхушку: %s." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 #, 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:566 +#: kallithea/controllers/pullrequests.py:564 #, 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:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -480,21 +473,21 @@ msgid "An error occurred during search operation." msgstr "Произошла ошибка при выполнении этого поиска." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Нет данных" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Статистические данные отключены для этого репозитария" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Настройки авторизации успешно обновлены" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "произошла ошибка при обновлении настроек авторизации" @@ -506,126 +499,140 @@ msgid "Error occurred during update of defaults" msgstr "Произошла ошибка при обновлении стандартных настроек" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 #, fuzzy msgid "Forever" msgstr "навсегда" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 минут" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 час" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 день" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 месяц" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Произошла ошибка во время создания gist-записи" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "Gist-запись %s удалена" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Неизменный" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "Данные gist-записи обновлены" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "Произошла ошибка при обновлении gist-записи %s" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можете изменить данные этого пользователя, поскольку он важен для " "работы всего приложения" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Ваша учетная запись успешно обновлена" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Произошла ошибка при обновлении пользователя %s" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Ошибка при обновлении пароля" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "Пользователю добавлен e-mail %s" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "Произошла ошибка при сохранении e-mail" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "E-mail пользователя удалён" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API-ключ успешно создан" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-ключ успешно сброшен" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-ключ успешно удалён" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "API-ключ успешно создан" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "API-ключ успешно удалён" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -633,9 +640,9 @@ msgid "Read" msgstr "Чтение" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -643,9 +650,9 @@ msgid "Write" msgstr "Запись" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -668,254 +675,239 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Администратор" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Отключено" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Разрешена, с ручной активацией учётной записи" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Разрешена, с автоматической активацией учётной записи" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Включено" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "Глобальные привилегии успешно обновлены" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Произошла ошибка во время обновления привилегий" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Произошла ошибка при создании группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Создана новая группа репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Группа репозиториев %s обновлена" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Произошла ошибка при обновлении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Данная группа содержит %s репозитариев и не может быть удалена" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Группа содержит в себе %s подгрупп и не может быть удалён" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Группа репозиториев %s удалена" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Произошла ошибка при удалении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "Администратор не может отозвать свои привелегии" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Привилегии группы репозиториев обновлены" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "Произошла ошибка при отзыве привелегии" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Произошла ошибка при создании репозитория %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Репозиторий %s создан из %s" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Сделан форк(копия) репозитория %s на %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Репозиторий %s создан" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Репозитарий %s успешно обновлён" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "Произошла ошибка во время обновления репозитория %s" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "Форки %s отсоединены" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "Удалены форки репозитория %s" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Репозиторий %s удалён" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Невозможно удалить %s, у него всё ещё есть форки" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "Произошла ошибка во время удаления %s" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Привилегии репозитория обновлены" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Произошла ошибка при удалении поля" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Не форк --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Видимость репозитория в публичном журнале обновлена" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "Произошла ошибка при установке репозитария в общедоступный журнал" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Ничего" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Репозиторий %s отмечен как форк %s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Произошла ошибка при выполнении операции" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Репозиторий заблокирован" - -#: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Репозиторий разблокирован" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Произошла ошибка во время разблокирования" - -#: kallithea/controllers/admin/repos.py:528 +#: kallithea/controllers/admin/repos.py:490 msgid "Cache invalidation successful" msgstr "Кэш сброшен" -#: kallithea/controllers/admin/repos.py:532 +#: kallithea/controllers/admin/repos.py:494 msgid "An error occurred during cache invalidation" msgstr "Произошла ошибка при очистке кэша" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "Внесены изменения из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "Произошла ошибка при внесении изменений из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "Произошла ошибка при удалении статистики репозитория" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "Обновлены настройки VCS" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -923,110 +915,110 @@ "Невозможно включить поддержку hgsubversion. Библиотека «hgsubversion» " "отсутствует" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Репозитории успешно пересканированы, добавлено: %s, удалено: %s." -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format msgid "Invalidated %s repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Произошла ошибка при обновлении настроек визуализации" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Нет данных" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Добавлена новая ловушка" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "произошла ошибка при создании хука" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Запланирована переиндексация базы Whoosh" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Создана группа пользователей %s" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Произошла ошибка при создании группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Группа пользователей %s обновлена" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "Произошла ошибка при обновлении группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "Группа пользователей успешно удалена" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 msgid "An error occurred during deletion of user group" msgstr "Произошла ошибка при удалении группы пользователей" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "Целевая группа не может быть такой же" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "Привилегии группы пользователей обновлены" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "Обновлены привилегии" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "Произошла ошибка при сохранении привилегий" @@ -1056,223 +1048,225 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Добавлен IP %s в белый список пользователя" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "Произошла ошибка при сохранении IP" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "Удален IP %s из белого списка пользователя" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" "Вы должны быть зарегистрированным пользователем, чтобы выполнить это " "действие" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "Страница доступна только авторизованным пользователям" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "Репозиторий не найден на файловой системе" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, fuzzy, python-format msgid "Changeset for %s %s not found in %s" msgstr "Набор изменений не найден" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "Ваш аккаунт выключен" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Двоичный файл" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Набор изменения оказался слишком большими и был урезан, используйте меню " "сравнения для показа результата сравнения" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "Изменений не обнаружено" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "Удалена ветка: %s" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "Создан тег: %s" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format msgid "Changeset %s not found" msgstr "Набор изменений не найден" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Показать отличия вместе %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 #, fuzzy msgid "Compare view" msgstr "сравнение" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "и" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "на %s больше" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "версии" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, fuzzy, python-format msgid "Fork name %s" msgstr "имя форка %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "Pull-запрос %s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "[создан] репозиторий" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[создан] репозиторий как форк" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "[форкнут] репозиторий" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "[обновлён] репозиторий" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "[загружен] архив из репозитория" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "[создан] пользователь" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "[обновлён] пользователь" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "[создана] группа пользователей" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "[обновлена] группа пользователей" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "[комментарий] к ревизии в репозитории" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "[прокомментировано] в запросе на внесение изменений для" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "[закрыт] Pull-запрос для" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[отправлено] в" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[внесены изменения с помощью Kallithea] в репозитории" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[внесены изменения] из" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[добавлен в наблюдения] репозиторий" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[удалён из наблюдения] репозиторий" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " и на %s больше" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Нет файлов" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "новый файл" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "изменён" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "удалён" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "переименован" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1283,7 +1277,34 @@ "переименован из файловой системы. Пожалуйста, перезапустите приложение " "для сканирования репозиториев" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1291,7 +1312,7 @@ msgstr[1] "%d лет" msgstr[2] "%d года" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1299,7 +1320,7 @@ msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1307,7 +1328,7 @@ msgstr[1] "%d дня" msgstr[2] "%d дней" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1315,7 +1336,7 @@ msgstr[1] "%d часов" msgstr[2] "%d часа" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1323,7 +1344,7 @@ msgstr[1] "%d минут" msgstr[2] "%d минуты" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1331,27 +1352,27 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунды" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "в %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "в %s и %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s и %s назад" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "прямо сейчас" @@ -1360,145 +1381,145 @@ msgid "on line %s" msgstr "на строке %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Упоминание]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "верхний уровень" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Администратор Kallithea" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "Неавторизованные пользователи имеют право чтения новых репозиториев" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" "Неавторизованные пользователи имеют право записи в новые репозитории" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "Только администраторы могут создавать группы" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Создана новая группа репозиториев %s" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 #, fuzzy msgid "Only admins can create user groups" msgstr "Создавать группы пользователей" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 #, fuzzy msgid "Non-admins can create user groups" msgstr "Создавать группы пользователей" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 #, fuzzy msgid "Only admins can fork repositories" msgstr "Местонахождение репозиториев" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "Регистрация отключена" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 #, fuzzy msgid "User registration with manual account activation" msgstr "Регистрация пользователя с ручной активацией учётной записи" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 #, fuzzy msgid "User registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 #, fuzzy msgid "Not reviewed" msgstr "Не просмотрено" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 #, fuzzy msgid "Under review" msgstr "На рассмотрении" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Одобрено" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Одобрено" @@ -1524,7 +1545,7 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, fuzzy, python-format #| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgid "" @@ -1532,72 +1553,72 @@ "%(branch)s" msgstr "[прокомментировано] в запросе на внесение изменений для" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "Новый пользователь \"%(new_username)s\" зарегистрирован" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, 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:171 +#: kallithea/model/notification.py:170 #, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "Закрыт" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, 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/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| msgid "Error creating pull request: %s" msgid "Cannot create empty pull request" msgstr "Ошибка при создании pull-запроса: %s" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 #, 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 +#: kallithea/model/pull_request.py:339 #, fuzzy #| msgid "Missing changesets since the previous pull request:" msgid "Missing changesets since the previous iteration:" msgstr "Отсутствующие ревизии относительно предыдущего pull-запроса:" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, 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 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, fuzzy, python-format #| msgid "" #| "This pull request is based on another %s revision and there is no " @@ -1608,26 +1629,41 @@ msgstr "" "Этот pull-запрос основан на другой ревизии %s, простой diff невозможен." -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, 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 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "последняя версия" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +msgid "SSH key %r not found" +msgstr "Набор изменений не найден" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "Регистрация нового пользователя" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 #, fuzzy msgid "" "You can't remove this user since it is crucial for the entire application" @@ -1635,7 +1671,7 @@ "Вы не можете удалить пользователя, поскольку это критично для работы " "всего приложения" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1644,7 +1680,7 @@ "Пользователь \"%s\" всё ещё является владельцем %s репозиториев и поэтому " "не может быть удалён. Смените владельца или удалите эти репозитории: %s" -#: kallithea/model/user.py:263 +#: kallithea/model/user.py:260 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " @@ -1654,7 +1690,7 @@ "поэтому не может быть удалён. Смените владельца или удалите данные " "группы: %s" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:267 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1664,37 +1700,37 @@ "поэтому не может быть удалён. Смените владельца или удалите данные " "группы: %s" -#: kallithea/model/user.py:364 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 #, fuzzy msgid "Password reset notification" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "Значение не может быть пустым списком" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Пользователь с именем \"%(username)s\" уже существует" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Имя \"%(username)s\" недопустимо" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or " @@ -1704,25 +1740,25 @@ "подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры " "либо с символа подчеркивания" -#: kallithea/model/validators.py:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "Имя \"%(username)s\" недопустимо" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Неверное имя группы пользователей" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Группа пользователей \"%(usergroup)s\" уже существует" -#: kallithea/model/validators.py:136 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1730,107 +1766,103 @@ "имя группы пользователей может содержать только буквы, цифры, символы " "подчеркивания, точки и тире; а так же должно начинаться с буквы или цифры" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Невозможно использовать эту группу как родителя" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Группа \"%(group_name)s\" уже существует" -#: kallithea/model/validators.py:179 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Репозитарий с именем \"%(group_name)s\" уже существует" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Недопустимые символы (не ascii) в пароле" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Неверно задан старый пароль" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "неверный пароль" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "Несовпадение токенов" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Имя репозитория %(repo)s запрещено" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Репозитарий %(repo)s уже существует" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Репозитарий \"%(repo)s\" уже существует в группе \"%(group)s\"" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Группа репозиториев \"%(repo)s\" уже существует" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 #, fuzzy msgid "Invalid repository URL" msgstr "приватный репозиторий" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "Тип форка будет совпадать с родительским" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "У вас недостаточно прав для создания репозиториев в этой группе" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "недостаточно прав для создания репозитория в корневом каталоге" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "У Вас недостаточно привилегий для создания группы в этом месте" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "Данное имя пользователя или группы пользователей недопустимо" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "Этот путь ошибочен" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 #, fuzzy msgid "This email address is already in use" msgstr "Этот E-mail уже занят" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "\"%(email)s\" не существует." -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1838,11 +1870,11 @@ "Для входа по LDAP должно быть указано значение аттрибута CN - это " "эквивалент имени пользователя" -#: kallithea/model/validators.py:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Пожалуйста, введите существующий IPv4 или IPv6 адре" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" @@ -1850,17 +1882,17 @@ "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - " "неверно)" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Ключевое имя может только состоять из букв, символа подчеркивания, тире " "или чисел" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "Файла нет в каталоге" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1902,24 +1934,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "Описание" @@ -1936,7 +1974,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1944,11 +1982,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "Владелец" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "Войти" @@ -1963,7 +2001,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1971,7 +2009,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "Пароль" @@ -2132,10 +2170,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Действие" @@ -2187,22 +2227,22 @@ msgstr "Плагин" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "Сохранить" @@ -2220,14 +2260,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2235,36 +2275,25 @@ msgstr "Приватные репозитории видны только их участникам." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "Включить статистику" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "Включить окно статистики на странице «Общие сведения»." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "Включить скачивание" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "Включить блокирование" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "Включить автоблокировку для репозитория." - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2311,8 +2340,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 #, fuzzy msgid "Never" msgstr "никогда" @@ -2346,7 +2377,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "Создать новую gist-запись" @@ -2382,23 +2413,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2426,7 +2459,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2486,7 +2519,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "Мой Аккаунт" @@ -2500,26 +2533,33 @@ msgid "Email Addresses" msgstr "Новый E-mail" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +#| msgid "API Keys" +msgid "SSH Keys" +msgstr "API-ключи" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "API-ключи" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 #, fuzzy msgid "Owned Repositories" msgstr "репозитории" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Создать репозитории" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 #, fuzzy msgid "Show Permissions" msgstr "Скопировать привилегии" @@ -2548,7 +2588,9 @@ msgstr "Подтвердите удаление этого API-ключа: %s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 #, fuzzy msgid "Remove" msgstr "Удалено" @@ -2567,12 +2609,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "Добавить" @@ -2675,6 +2719,47 @@ msgid "Name" msgstr "Имя" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "Фамилия" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "Подтвердите удаление этого API-ключа: %s" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +msgid "New SSH key" +msgstr "Ключ" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public repository" +msgid "Public key" +msgstr "Публичный репозиторий" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Репозитории, за которыми Вы наблюдаете" @@ -2691,7 +2776,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "Белый список IP" @@ -2733,7 +2818,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2902,7 +2987,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "Дополнительно" @@ -3019,19 +3104,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "Удалить эту группу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "Подтвердите удаление этой группы пользователей" @@ -3061,7 +3138,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3069,7 +3146,7 @@ "Короткое и осмысленное. Для развернутого описания используйте файл README." #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Опционально выбрать группу, в которую поместить данный репозиторий." @@ -3079,7 +3156,7 @@ msgstr "Тип создаваемого репозитория." #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Ревизия для выгрузки" @@ -3131,8 +3208,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "Статистика" @@ -3168,54 +3245,17 @@ "Все производимые с этим репозиторием действия будут отображаться в " "публичном журнале." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" -msgstr "Включить блокирование" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "Подтвердите снятие блокировки с репозитория." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "Разблокировать репозиторий" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "Подтвердите блокировку репозитория." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "Заблокировать репозиторий" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "Репозиторий не заблокирован" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Подтвердите удаление этого репозитория: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Delete this Repository" msgstr "Удалить этот репозиторий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3223,15 +3263,15 @@ msgstr[1] "Данный репозиторий имеет %s копии" msgstr[2] "Данный репозиторий имеет %s копий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "Отсоединить fork'и" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "Удалить fork'и" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3335,20 +3375,12 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 #, fuzzy -msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "приватный репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3358,34 +3390,34 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy msgid "Remote repository" msgstr "[создан] репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 #, fuzzy msgid "Repository URL" msgstr "Репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " "скачивании" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "Изменить владельца репозитория." @@ -3494,8 +3526,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "Сохранить настройки" @@ -3593,10 +3625,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3617,15 +3645,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3634,40 +3654,32 @@ msgstr "Показывать размер репозитория после отправки" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "Логировать пользовательские команды отправки" - -#: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "Логировать пользовательские команды получения" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Обновлять репозиторий после отправки (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Mercurial extensions" msgstr "Расширения Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "Включить поддержку больших файлов" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "Включить поддержку hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 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/templates/admin/settings/settings_vcs.html:47 msgid "Location of repositories" msgstr "Местонахождение репозиториев" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect." @@ -3675,7 +3687,7 @@ "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки " "Kallithea." -#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3724,8 +3736,9 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +#, fuzzy +#| msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "Ссылка для клонирования" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3743,59 +3756,76 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +#| msgid "Clone URL" +msgid "SSH Clone URL" +msgstr "Ссылка для клонирования" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repository Size" msgid "Repository page size" msgstr "Размер репозитория" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "Иконки" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "Показывать иконки публичных репозиториев" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "Показывать иконки приватных репозиториев" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "Показывать иконки публичных репозиториев." -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 #, fuzzy msgid "Meta Tagging" msgstr "Метатегирование" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3957,12 +3987,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Репозиторий Mercurial" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Git репозиторий" @@ -4010,158 +4040,132 @@ msgstr "Сравнить" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Поиск" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "Разблокировать" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "Заблокировать" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "Наблюдать" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "Не наблюдать" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "Переключиться на" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:289 msgid "Show recent activity" msgstr "Показать последнюю активность" -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/base/base.html:296 msgid "Public journal" msgstr "Общедоступный журнал" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:301 msgid "Show public gists" msgstr "Показать публичные записи" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:302 msgid "Gists" msgstr "Gist" -#: kallithea/templates/base/base.html:313 +#: kallithea/templates/base/base.html:306 msgid "All Public Gists" msgstr "Все публичные Gist-записи" -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:308 msgid "My Public Gists" msgstr "Мои публичные Gist-записи" -#: kallithea/templates/base/base.html:316 +#: kallithea/templates/base/base.html:309 msgid "My Private Gists" msgstr "Мои приватные Gist-записи" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "Поиск по репозиториям" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Мои Pull-запросы" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "Не авторизован" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "Авторизоваться" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "Забыли пароль?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "Нет аккаунта?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "Выход" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "Значения по умолчанию" +msgid "Create repositories" +msgstr "Создать репозитории" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "Стандартные привилегии" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "Создать репозитории" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "Опция разрешает пользователю создавать репозитарии" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "Создавать группы пользователей" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "Опция разрешает пользователю создавать группы пользователей" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "Создавать fork от репозиториев" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" "Выберите эту опцию чтобы разрешить данному пользователю создавать fork'и " @@ -4926,7 +4930,7 @@ msgstr "Сравнение файла %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "%s Файлы" @@ -4938,7 +4942,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4991,7 +4995,7 @@ msgstr "Загружается список файлов..." #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "Размер" @@ -5121,8 +5125,8 @@ msgstr "%s Наблюдатели" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "Наблюдатели" @@ -5175,8 +5179,8 @@ msgstr "Форки %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "Ответвления" @@ -5495,9 +5499,9 @@ msgid "File names" msgstr "Имя файла" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Недостаточно прав" @@ -5507,20 +5511,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "ATOM лента репозитория %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "RSS лента репозитория %s" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "Включено" @@ -5529,12 +5533,12 @@ msgstr "Полученная статистика: " #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "файлы" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "Показать еще" @@ -5575,95 +5579,180 @@ msgid "%s Summary" msgstr "%s общие сведения" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "Репозитарий заблокирован %s" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "Репозиторий разблокирован" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "Форк от" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "Клонировать из" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "Показать по ID" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "Ссылка для клонирования" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "Показать по имени" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "Фамилия" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "Популярные файлы" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "Скачать" -#: kallithea/templates/summary/summary.html:101 +#: kallithea/templates/summary/summary.html:109 msgid "There are no downloads yet" msgstr "Скачиваний ещё нет" -#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:111 msgid "Downloads are disabled for this repository" msgstr "Скачивание отключено в этом репозитории" -#: kallithea/templates/summary/summary.html:109 +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "Скачать в zip" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "Отметьте для скачивания архива с дочерними репозиториями" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "С дочерними репозиториями" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "Лента новостей" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "Последние изменения" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "Быстрый старт" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "Добавить или загрузить файлы через Kallithea" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "Отправить новый репозиторий" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "Существующий репозиторий?" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "Скачать %s как %s" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Репозиторий заблокировал %s в %s" + +#~ msgid "Repository has been locked" +#~ msgstr "Репозиторий заблокирован" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Репозиторий разблокирован" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Произошла ошибка во время разблокирования" + +#~ msgid "Token mismatch" +#~ msgstr "Несовпадение токенов" + +#~ msgid "Enable locking" +#~ msgstr "Включить блокирование" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "Включить автоблокировку для репозитория." + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "" +#~ "Включить автоблокировку для группы. Эта опция будет применена ко всем " +#~ "дочерним группам и репозиториям" + +#~ msgid "Change Locking" +#~ msgstr "Включить блокирование" + +#~ msgid "Confirm to unlock repository." +#~ msgstr "Подтвердите снятие блокировки с репозитория." + +#~ msgid "Unlock Repository" +#~ msgstr "Разблокировать репозиторий" + +#~ msgid "Confirm to lock repository." +#~ msgstr "Подтвердите блокировку репозитория." + +#~ msgid "Lock Repository" +#~ msgstr "Заблокировать репозиторий" + +#~ msgid "Repository is not locked" +#~ msgstr "Репозиторий не заблокирован" + +#~ msgid "Log user push commands" +#~ msgstr "Логировать пользовательские команды отправки" + +#~ msgid "Log user pull commands" +#~ msgstr "Логировать пользовательские команды получения" + +#~ msgid "Unlock" +#~ msgstr "Разблокировать" + +#~ msgid "Lock" +#~ msgstr "Заблокировать" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "Значения по умолчанию" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "Стандартные привилегии" + +#~ msgid "Repository locked by %s" +#~ msgstr "Репозитарий заблокирован %s" + +#~ msgid "Repository unlocked" +#~ msgstr "Репозиторий разблокирован" + +#~ msgid "Show by ID" +#~ msgstr "Показать по ID" + +#~ msgid "Show by Name" +#~ msgstr "Показать по имени" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh" @@ -5895,9 +5984,6 @@ #~ msgid "invalid user name" #~ msgstr "неверное имя пользователя" -#~ msgid "Your account is disabled" -#~ msgstr "Ваш аккаунт выключен" - #~ msgid "invalid clone URL" #~ msgstr "неверный URL для клонирования"
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,12 +1,11 @@ # Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2015-04-01 12:59+0200\n" "Last-Translator: Andrej Shadura <andrew@shadura.me>\n" "Language-Team: Slovak <https://hosted.weblate.org/projects/kallithea/" @@ -19,14 +18,14 @@ "Generated-By: Babel 1.3\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Zatiaľ nie sú žiadne zmeny" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,104 +34,104 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(zatvorené)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Ukázať medzery" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorovať medzery" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy msgid "No permission to change status" msgstr "Zmeny" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "Taká revízia neexistuje" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, 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:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 #, fuzzy msgid "No response" msgstr "Neznáma revízia %s" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "Nemáte oprávnenie na zobrazenie tejto stránky" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -142,121 +141,115 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Zmeny na repozitáre %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Kliknite pre pridanie nového súboru" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Zatiaľ nie sú žiadne súbory. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, 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:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Zmazaný súbor %s cez Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Došlo k chybe pri ukladaní" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Žiadne zmeny" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Pridaný súbor cez Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Žiadny obsah" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Sťahovanie vypnuté" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Neznáma revízia %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Prázdny repozitár" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Zmeny" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Vetvy" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Tagy" @@ -265,11 +258,11 @@ msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -277,178 +270,178 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repozitáre" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Vetva" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 #, fuzzy msgid "Bad captcha" msgstr "zlá captcha" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Úspešne aktualizované heslo" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (zatvorené)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -464,21 +457,21 @@ msgid "An error occurred during search operation." msgstr "Došlo k chybe počas vyhľadávania." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" @@ -490,123 +483,136 @@ msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 minút" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 hodina" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 deň" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 mesiac" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Došlo k chybe pri vytváraní gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, 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:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:166 +#: 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:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "Došlo k chybe pri ukladaní e-mailovej adresy" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "Successfully deleted file %s" +msgid "SSH key successfully deleted" +msgstr "Úspešne zmazaný súbor %s" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -614,9 +620,9 @@ msgid "Read" msgstr "" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -624,9 +630,9 @@ msgid "Write" msgstr "" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -649,364 +655,347 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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:42 -#: kallithea/templates/base/root.html:50 -msgid "Disabled" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 -msgid "Allowed with manual account activation" +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" msgstr "" #: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Nič" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -#, fuzzy -msgid "Repository has been locked" -msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -#, fuzzy -msgid "Repository has been unlocked" -msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format #| msgid "Watched Repositories" msgid "Invalidated %s repositories" msgstr "Repozitáre" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "" +#: kallithea/controllers/admin/settings.py:357 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + #: kallithea/controllers/admin/settings.py:360 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - -#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1036,219 +1025,219 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "Zmeny" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1256,7 +1245,34 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1264,7 +1280,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1272,7 +1288,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1280,7 +1296,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1288,7 +1304,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1296,7 +1312,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1304,27 +1320,27 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "" @@ -1333,135 +1349,135 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 #, fuzzy msgid "Only admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1487,303 +1503,315 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "SSH key %r not found" +msgstr "Zmeny" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 #, fuzzy msgid "Invalid repository URL" msgstr "Odblokovať repozitár" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1824,24 +1852,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1858,7 +1892,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1866,11 +1900,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1885,7 +1919,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1893,7 +1927,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -2050,10 +2084,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2102,22 +2138,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2136,14 +2172,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2151,36 +2187,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2227,8 +2252,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2261,7 +2288,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2297,23 +2324,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2341,7 +2370,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2401,7 +2430,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2414,26 +2443,31 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 #, fuzzy msgid "Owned Repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2460,7 +2494,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2476,12 +2512,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2582,6 +2620,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" @@ -2598,7 +2672,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2635,7 +2709,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2795,7 +2869,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2904,17 +2978,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2944,14 +3012,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2961,7 +3029,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -3013,8 +3081,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -3048,54 +3116,17 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "Odblokovať repozitár" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "Potvrdenie blokovania repozitára." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "Zablokovať repozitár" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "Vymazať tento repozitár" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3103,15 +3134,15 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3214,20 +3245,12 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 #, fuzzy -msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3237,32 +3260,32 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy msgid "Remote repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 #, fuzzy msgid "Repository URL" msgstr "Repozitáre" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3371,8 +3394,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "" @@ -3467,10 +3490,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3491,15 +3510,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3508,47 +3519,39 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 #, fuzzy msgid "Location of repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3597,8 +3600,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3616,58 +3618,73 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repositories" msgid "Repository page size" msgstr "Repozitáre" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3828,12 +3845,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3881,152 +3898,128 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "Repozitáre" +msgid "Create repositories" +msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -msgid "default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4763,7 +4756,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4775,7 +4768,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4828,7 +4821,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4957,8 +4950,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -5009,8 +5002,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5316,9 +5309,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5328,20 +5321,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5350,12 +5343,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5396,95 +5389,123 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "Posledné zmeny" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:188 -msgid "Add or upload files directly via Kallithea" -msgstr "" - #: kallithea/templates/summary/summary.html:196 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "Prázdny repozitár" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" + +#, fuzzy +#~ msgid "Repository has been locked" +#~ msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" + +#, fuzzy +#~ msgid "Repository has been unlocked" +#~ msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" + +#~ msgid "Unlock Repository" +#~ msgstr "Odblokovať repozitár" + +#~ msgid "Confirm to lock repository." +#~ msgstr "Potvrdenie blokovania repozitára." + +#~ msgid "Lock Repository" +#~ msgstr "Zablokovať repozitár" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "Repozitáre" + #, fuzzy #~| msgid "Repository URL" #~ msgid "Repository Group"
--- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2017 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3.2\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2018-03-31 21:42+0000\n" "Last-Translator: Максим Якимчук <xpinovo@gmail.com>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/kallithea/" @@ -19,14 +18,14 @@ "X-Generator: Weblate 2.20-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,101 +34,101 @@ msgid "None" msgstr "Нічого" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Відображати пробіли" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ігнорувати пробіли" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 msgid "No permission to change status" msgstr "" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 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:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -139,119 +138,113 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 msgid "There are no files yet." msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "" @@ -260,11 +253,11 @@ msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -272,177 +265,177 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Без опису" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -458,21 +451,21 @@ msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" @@ -484,123 +477,134 @@ msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 хвилин" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 день" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 місяць" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +msgid "SSH key successfully deleted" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -608,9 +612,9 @@ msgid "Read" msgstr "" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -618,9 +622,9 @@ msgid "Write" msgstr "" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -643,360 +647,345 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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:42 -#: kallithea/templates/base/root.html:50 -msgid "Disabled" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 -msgid "Allowed with manual account activation" +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" msgstr "" #: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:466 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:468 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "" +#: kallithea/controllers/admin/settings.py:357 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + #: kallithea/controllers/admin/settings.py:360 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - -#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1026,218 +1015,218 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +msgid "SSH access is disabled." +msgstr "" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1245,7 +1234,34 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1253,7 +1269,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1261,7 +1277,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1269,7 +1285,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1277,7 +1293,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1285,7 +1301,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1293,27 +1309,27 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "" @@ -1322,133 +1338,133 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1474,302 +1490,313 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, python-format +msgid "SSH key %r not found" +msgstr "" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1810,24 +1837,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "" @@ -1844,7 +1877,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1852,11 +1885,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1871,7 +1904,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1879,7 +1912,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "" @@ -2036,10 +2069,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" @@ -2088,22 +2123,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "" @@ -2121,14 +2156,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2136,36 +2171,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2212,8 +2236,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 msgid "Never" msgstr "" @@ -2246,7 +2272,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2282,23 +2308,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2326,7 +2354,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2386,7 +2414,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "" @@ -2399,24 +2427,29 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 -msgid "API Keys" -msgstr "" - #: kallithea/templates/admin/my_account/my_account.html:29 -msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:30 -#: kallithea/templates/journal/journal.html:33 -msgid "Watched Repositories" +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:32 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:33 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "" @@ -2443,7 +2476,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "" @@ -2459,12 +2494,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2565,6 +2602,42 @@ msgid "Name" msgstr "" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +msgid "Last Used" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +msgid "Public key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" @@ -2581,7 +2654,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2617,7 +2690,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2777,7 +2850,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2884,17 +2957,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2922,14 +2989,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2939,7 +3006,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -2991,8 +3058,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "" @@ -3026,54 +3093,17 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3081,15 +3111,15 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3186,19 +3216,11 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "Permanent URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3208,30 +3230,30 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3340,8 +3362,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "" @@ -3436,10 +3458,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3460,15 +3478,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3477,46 +3487,38 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" +msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:35 +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:47 -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 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3565,8 +3567,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3584,56 +3585,71 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +msgid "SSH Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Repository page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3794,12 +3810,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "" @@ -3847,151 +3863,128 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 msgid "Forgot password?" msgstr "" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 msgid "Don't have an account?" msgstr "" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -msgid "Inherit defaults" +msgid "Create repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -msgid "default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4705,7 +4698,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4717,7 +4710,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4769,7 +4762,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "" @@ -4898,8 +4891,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -4950,8 +4943,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5257,9 +5250,9 @@ msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -5269,20 +5262,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5291,12 +5284,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "файли" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "Показати більше" @@ -5337,90 +5330,94 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "Клонувати з" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +msgid "Use Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "Останні зміни" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "Швидкий старт" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/summary/summary.html:196 -msgid "Push new repository" -msgstr "" - #: kallithea/templates/summary/summary.html:204 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr ""
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-08-14 19:00+0000\n" "Last-Translator: Elizabeth Sherrock <lizzyd710@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" @@ -19,14 +18,14 @@ "Generated-By: Babel 1.3\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "还没有修订集" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,103 +34,103 @@ msgid "None" msgstr "无" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(已关闭)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "显示空白" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "忽略空白" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "增加差异上下文到 %(num)s 行" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "Set changeset status" msgid "No permission to change status" msgstr "设置修订集状态" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "成功删除拉取请求" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "在此代码库内，此修改并不存在" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, python-format msgid "Could not find other repository %s" msgstr "找不到那个版本库 %s" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "无响应" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "未知错误" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "由于错误的语法，服务器无法对请求进行响应。" -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "未授权的资源访问" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "无权访问该页面" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "资源未找到" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -141,121 +140,115 @@ msgid "Changeset was too big and was cut off..." msgstr "修订集太大并已被截断..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s %s订阅" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "%s库的修改" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "点击这里添加新文件" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "这里还没有文件。" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s 在 %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "版本库由%s于%s锁定" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "您只能删除有效分支的修订中的文件" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "删除文件 %s 通过 Kallithea" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "成功删除文件 %s" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "您只能编辑有效分支的修订中的文件" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "已编辑文件 %s 通过 Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "无变更" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "已添加文件通过 Kallithea" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "无内容" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "无文件名" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "下载已禁用" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "空版本库" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "未知包类型" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "修订集" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "标签" @@ -264,11 +257,11 @@ msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "组" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -276,184 +269,184 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "版本库" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "分支" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "已关闭分支" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "标签" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "书签" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "公共日志" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "日志" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "验证码错误" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "您已成功注册 %s" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "密码重置确认码已经发送" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "无效的密码重置令牌" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "成功更新密码" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "指定的审核者 \"%s\" 无效" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (已关闭)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "修订集" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "特殊" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "同等分支" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "书签" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "创建拉取请求出错：%s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "创建拉取请求时发生错误" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "拉取请求更新已创建" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "无描述" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "拉取请求已更新" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, fuzzy, python-format #| msgid "Changeset for %s %s not found in %s" msgid "Revision %s not found in %s" msgstr "未找到修订集" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, 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:522 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:524 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 #, 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:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, 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:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -469,21 +462,21 @@ msgid "An error occurred during search operation." msgstr "搜索操作期间发生错误。" -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "数据尚未就绪" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "验证设置更新成功" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "验证设置更新时发生错误" @@ -495,124 +488,138 @@ msgid "Error occurred during update of defaults" msgstr "默认值更新时发生错误" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 #, fuzzy msgid "Forever" msgstr "检视者" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 分钟" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 小时" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 天" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 个月" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "gist 创建时发生错误" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "已删除 gist %s" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "未修改" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "成功更新 gist 内容" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "成功更新 gist 数据" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "gist %s 更新时发生错误" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "用户 %s 更新时发生错误" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "用户密码更新时发生错误" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "已为用户添加电子邮件 %s" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "成功删除用户电子邮件" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API 密钥创建成功" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API 密钥重置成功" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API 密钥删除成功" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "API 密钥创建成功" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "API 密钥删除成功" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -620,9 +627,9 @@ msgid "Read" msgstr "读" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -630,9 +637,9 @@ msgid "Write" msgstr "写" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -655,365 +662,348 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "停用" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "已允许手动激活账号" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "已允许自动激活账号" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "外部账号手动激活" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "启用" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "全局权限更新成功" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "权限更新时发生错误" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "这个组内有%s个版本库因而无法删除" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "版本库%s成功更新" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除%s的时候发生错误" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, 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:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "无" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -#, fuzzy -msgid "Repository has been locked" -msgstr "版本库未锁定" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -#, fuzzy -msgid "Repository has been unlocked" -msgstr "版本库未锁定" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "解锁时发生错误" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format msgid "Invalidated %s repositories" msgstr "清除版本库缓存" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "更新应用设置" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "数据尚未就绪" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "新建钩子" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "更新钩子" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" @@ -1043,219 +1033,221 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "必须登录才能访问该页面" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, fuzzy, python-format msgid "Changeset for %s %s not found in %s" msgstr "未找到修订集" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "该帐号已被禁用" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "修订集过大并已被截断，使用差异菜单查看此差异" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "未发现差异" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支%s" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "创建标签%s" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format msgid "Changeset %s not found" msgstr "未找到修订集" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "显示所有合并的修订集 %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 #, fuzzy msgid "Compare view" msgstr "比较显示" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "还有" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "%s个" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "修订" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, fuzzy, python-format msgid "Fork name %s" msgstr "复刻名称%s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, fuzzy, python-format msgid "Pull request %s" msgstr "拉取请求#%s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "[创建]版本库" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "[复刻]版本库" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "[更新]版本库" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "[创建]用户" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "[更新]用户" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "[评论]了版本库中的修订" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[推送]到" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[通过Kallithea提交]到版本库" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[拉取]自" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " 还有%s个" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "无文件" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1265,63 +1257,90 @@ "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启Kallithea" "以重新扫描版本库" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "%s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "%s前" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s零%s前" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "刚才" @@ -1330,143 +1349,143 @@ msgid "on line %s" msgstr "在%s行" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[提及]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Kallithea 管理员" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 #, fuzzy msgid "Default user has read access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 #, fuzzy msgid "Default user has write access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 #, fuzzy msgid "Only admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 #, fuzzy msgid "Non-admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 #, fuzzy msgid "Only admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 #, fuzzy msgid "Non-admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 #, fuzzy msgid "Not reviewed" msgstr "未检视" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 #, fuzzy msgid "Under review" msgstr "检视中" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "已批准" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "已批准" @@ -1492,7 +1511,7 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, fuzzy, python-format #| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgid "" @@ -1500,104 +1519,119 @@ "%(branch)s" msgstr "[评论] %(repo_name)s 修订集 %(short_id)s 在 %(branch)s" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "用户名称 %(new_username)s 无效" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, 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:171 +#: kallithea/model/notification.py:170 #, 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:184 +#: kallithea/model/notification.py:183 #, fuzzy msgid "Closing" msgstr "使用中" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| msgid "Error creating pull request: %s" msgid "Cannot create empty pull request" msgstr "创建拉取请求出错：%s" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 #, 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 +#: kallithea/model/pull_request.py:339 #, fuzzy #| msgid "Missing changesets since the previous pull request:" msgid "Missing changesets since the previous iteration:" msgstr "缺少上次拉取请求之后的修订集：" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, 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 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, 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 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "最新tip版本" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +msgid "SSH key %r not found" +msgstr "未找到修订集" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 #, fuzzy msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "由于是系统帐号，无法删除该用户" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1606,7 +1640,7 @@ "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本" "库。%s" -#: kallithea/model/user.py:263 +#: kallithea/model/user.py:260 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " @@ -1615,7 +1649,7 @@ "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本" "库。%s" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:267 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1624,191 +1658,187 @@ "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本" "库。%s" -#: kallithea/model/user.py:364 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 #, fuzzy msgid "Password reset notification" msgstr "确认密码" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "值不能为空" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "用户名称%(username)s已经存在" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "用户名称 %(username)s 无效" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "用户名称 %(username)s 无效" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "不能将这个组作为parent" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "组 \"%(group_name)s\" 已经存在" -#: kallithea/model/validators.py:179 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "已经存在名为 \"%(group_name)s\" 的版本库" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效（非ASCII）字符" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "密码不符" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "无效密码" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "令牌不匹配" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "版本库名称不能为%(repo)s" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "已经存在版本库%(repo)s" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\"" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 #, fuzzy msgid "Invalid repository URL" msgstr "私有版本库" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "复刻版本库必须和父版本库类型相同" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 #, fuzzy msgid "This email address is already in use" msgstr "该邮件地址已被使用" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "邮件地址\"%(email)s\"不存在" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1849,24 +1879,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "描述" @@ -1883,7 +1919,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1891,11 +1927,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "所有者" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "登录" @@ -1910,7 +1946,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1918,7 +1954,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "密码" @@ -2080,10 +2116,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "操作" @@ -2132,22 +2170,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "保存" @@ -2166,14 +2204,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2181,36 +2219,25 @@ msgstr "私有版本库只对成员可见。" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "启用统计" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "启用概况页面上的统计窗口。" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "启用下载" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "启用锁定" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "启用版本库的拉取锁定。" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2257,8 +2284,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 #, fuzzy msgid "Never" msgstr "检视者" @@ -2292,7 +2321,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2328,23 +2357,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2372,7 +2403,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2432,7 +2463,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "我的账户" @@ -2446,26 +2477,31 @@ msgid "Email Addresses" msgstr "增加邮箱" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 #, fuzzy msgid "Owned Repositories" msgstr "版本库" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "创建版本库" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 #, fuzzy msgid "Show Permissions" msgstr "拷贝权限" @@ -2493,7 +2529,9 @@ msgstr "确认删除用户：%s" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 #, fuzzy msgid "Remove" msgstr "移除" @@ -2510,12 +2548,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "增加" @@ -2619,6 +2659,46 @@ msgid "Name" msgstr "名称" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "姓" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "确认删除用户：%s" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public repository" +msgid "Public key" +msgstr "公共版本库" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 #, fuzzy msgid "Repositories You are Watching" @@ -2637,7 +2717,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2676,7 +2756,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2838,7 +2918,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2950,17 +3030,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 #, fuzzy msgid "Confirm to delete this group" msgstr "确认删除用户：%s" @@ -2993,14 +3067,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 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:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "可选的选择一个组将版本库放到其中。" @@ -3010,7 +3084,7 @@ msgstr "要创建的版本库类型。" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "默认修订" @@ -3062,8 +3136,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "统计" @@ -3102,74 +3176,32 @@ "public journal." msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -#, fuzzy -msgid "Change Locking" -msgstr "启用锁定" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -#, fuzzy -msgid "Confirm to unlock repository." -msgstr "确认解锁版本库" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -#, fuzzy -msgid "Unlock Repository" -msgstr "公共版本库" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, fuzzy -msgid "Confirm to lock repository." -msgstr "确认锁定版本库" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -#, fuzzy -msgid "Lock Repository" -msgstr "公共版本库" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "版本库未锁定" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库：%s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #, fuzzy msgid "Delete this Repository" msgstr "[删除]版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3276,20 +3308,12 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#, fuzzy -msgid "Permanent Repository ID" +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#, fuzzy +msgid "Permanent URL" msgstr "私有版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3299,32 +3323,32 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy msgid "Remote repository" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 #, fuzzy msgid "Repository URL" msgstr "版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "文件浏览、下载、whoosh和README的默认修订版本" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "修改这个版本库的所有者。" @@ -3437,8 +3461,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 #, fuzzy msgid "Save Settings" msgstr "保存设置" @@ -3537,10 +3561,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3562,15 +3582,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3579,48 +3591,40 @@ msgstr "推送后显示版本库大小" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "记录用户推送命令" +msgid "Update repository after push (hg update)" +msgstr "推送后更新版本库（hg update）" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "记录用户拉取命令" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "推送后更新版本库（hg update）" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 #, fuzzy msgid "Mercurial extensions" msgstr "Mercurial扩展" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 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/templates/admin/settings/settings_vcs.html:47 #, fuzzy msgid "Location of repositories" msgstr "创建版本库" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3669,9 +3673,8 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -#, fuzzy -msgid "Clone URL" +#, fuzzy +msgid "HTTP Clone URL" msgstr "克隆地址" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3689,60 +3692,76 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +msgid "SSH Clone URL" +msgstr "克隆地址" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "repositories" msgid "Repository page size" msgstr "版本库" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "图标" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "显示公共版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "显示私有版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 #, fuzzy msgid "Show public/private icons next to repository names." msgstr "显示公共版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 #, fuzzy msgid "Meta Tagging" msgstr "元标记" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3906,12 +3925,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Mercurial版本库" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Git版本库" @@ -3961,160 +3980,134 @@ msgstr "比较显示" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "搜索" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "复刻" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "公共日志" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" -msgstr "公共日志" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" +msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "拉取请求" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 #, fuzzy msgid "Login to Your Account" msgstr "登录" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "忘记密码？" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "还没有帐号？" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "退出" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "版本库默认设置" +msgid "Create repositories" +msgstr "创建版本库" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "默认权限" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "创建版本库" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "复刻版本库" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4870,7 +4863,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4882,7 +4875,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4936,7 +4929,7 @@ msgstr "加载文件列表..." #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "大小" @@ -5067,8 +5060,8 @@ msgstr "%s个关注者" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "关注者" @@ -5120,8 +5113,8 @@ msgstr "%s个复刻" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "复刻" @@ -5448,9 +5441,9 @@ msgid "File names" msgstr "文件名" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "权限不足" @@ -5460,20 +5453,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5482,12 +5475,12 @@ msgstr "已收集的统计： " #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "文件" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5528,98 +5521,183 @@ msgid "%s Summary" msgstr "%s概要" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "版本库由%s锁定" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "版本库未锁定" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "复刻自" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "克隆自" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "按ID显示" - +#: kallithea/templates/summary/summary.html:54 +#, fuzzy +msgid "Clone URL" +msgstr "克隆地址" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "以名字显示" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "姓" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "文件趋势图" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "下载" -#: kallithea/templates/summary/summary.html:101 +#: kallithea/templates/summary/summary.html:109 msgid "There are no downloads yet" msgstr "无下载" -#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:111 msgid "Downloads are disabled for this repository" msgstr "这个版本库的下载已经禁用" -#: kallithea/templates/summary/summary.html:109 +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "zip打包下载" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "勾选以下载包含子版本库的压缩包" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 #, fuzzy msgid "With subrepos" msgstr "包括子版本库" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 #, fuzzy msgid "Latest Changes" msgstr "文件已更改" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 #, fuzzy msgid "Quick Start" msgstr "快速入门" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "通过Kallithea直接添加或者上传文件" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "推送新版本库" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "已有版本库？" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "下载%s为%s包" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "版本库由%s于%s锁定" + +#, fuzzy +#~ msgid "Repository has been locked" +#~ msgstr "版本库未锁定" + +#, fuzzy +#~ msgid "Repository has been unlocked" +#~ msgstr "版本库未锁定" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "解锁时发生错误" + +#~ msgid "Token mismatch" +#~ msgstr "令牌不匹配" + +#~ msgid "Enable locking" +#~ msgstr "启用锁定" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "启用版本库的拉取锁定。" + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库" + +#, fuzzy +#~ msgid "Change Locking" +#~ msgstr "启用锁定" + +#, fuzzy +#~ msgid "Confirm to unlock repository." +#~ msgstr "确认解锁版本库" + +#, fuzzy +#~ msgid "Unlock Repository" +#~ msgstr "公共版本库" + +#, fuzzy +#~ msgid "Confirm to lock repository." +#~ msgstr "确认锁定版本库" + +#, fuzzy +#~ msgid "Lock Repository" +#~ msgstr "公共版本库" + +#~ msgid "Repository is not locked" +#~ msgstr "版本库未锁定" + +#~ msgid "Log user push commands" +#~ msgstr "记录用户推送命令" + +#~ msgid "Log user pull commands" +#~ msgstr "记录用户拉取命令" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "版本库默认设置" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "默认权限" + +#~ msgid "Repository locked by %s" +#~ msgstr "版本库由%s锁定" + +#~ msgid "Repository unlocked" +#~ msgstr "版本库未锁定" + +#~ msgid "Show by ID" +#~ msgstr "按ID显示" + +#~ msgid "Show by Name" +#~ msgstr "以名字显示" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "没有索引用于搜索。请运行whoosh索引器" @@ -5762,9 +5840,6 @@ #~ msgid "invalid user name" #~ msgstr "无效用户名" -#~ msgid "Your account is disabled" -#~ msgstr "该帐号已被禁用" - #~ msgid "invalid clone URL" #~ msgstr "无效的克隆地址"
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2017-03-10 18:26+0000\n" "Last-Translator: mao <mao@lins.fju.edu.tw>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" @@ -19,14 +18,14 @@ "Generated-By: Babel 1.3\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -35,103 +34,103 @@ msgid "None" msgstr "無" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "（已關閉）" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "顯示空格" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "忽略空格" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "增加 diff 上下文至 %(num)s 行" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy msgid "No permission to change status" msgstr "尚未有任何變更" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, fuzzy, python-format #| msgid "Go to tip of repository" msgid "Could not find other repository %s" msgstr "Git 版本庫" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:244 -msgid "Cannot show empty diff" -msgstr "" - #: kallithea/controllers/compare.py:246 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 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:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "您沒有權限瀏覽這個頁面" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "找不到這個資源" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s 評論於 %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -141,121 +140,115 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "修改於版本庫 %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no forks yet" msgid "There are no files yet." msgstr "尚未有任何 fork" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "沒有修改" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "空的版本庫" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "變更" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "標籤" @@ -264,11 +257,11 @@ msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -276,177 +269,177 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "版本庫" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "開放日誌" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "日誌" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "密碼重設的確認碼已寄出" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "無效的密碼重設確認碼" -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "無描述" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:522 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" +#: kallithea/controllers/pullrequests.py:541 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + #: kallithea/controllers/pullrequests.py:543 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" +#: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + #: kallithea/controllers/pullrequests.py:564 -msgid "Git pull requests don't support iterating yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -462,21 +455,21 @@ msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "" @@ -488,123 +481,135 @@ msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 -#: kallithea/controllers/admin/users.py:249 -msgid "5 minutes" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 -#: kallithea/controllers/admin/users.py:250 -msgid "1 hour" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 -#: kallithea/controllers/admin/users.py:251 -msgid "1 day" +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: 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:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "未修改" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:230 -msgid "Successfully updated gist data" -msgstr "" - #: kallithea/controllers/admin/gists.py:233 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, python-format +msgid "SSH key %s successfully added" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +msgid "SSH key successfully deleted" +msgstr "成功遞交至 %s" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -612,9 +617,9 @@ msgid "Read" msgstr "讀" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -622,9 +627,9 @@ msgid "Write" msgstr "寫" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -647,361 +652,346 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "停用" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "啟用" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:466 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:468 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "儲存所已被鎖定" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "儲存所已打開" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format #| msgid "Invalidate Repository Cache" msgid "Invalidated %s repositories" msgstr "確認廢止版本庫快取" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "更新應用設定" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 msgid "Hook already exists" msgstr "" +#: kallithea/controllers/admin/settings.py:357 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + #: kallithea/controllers/admin/settings.py:360 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - -#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "新增hook" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "更新hook" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:212 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:217 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" @@ -1031,219 +1021,221 @@ msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "您的帳號已被停用" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "尚未有任何變更" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "尚未有任何變更" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "和" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "修訂" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "分支名稱 %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "提取要求 %s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1251,63 +1243,90 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "現在" @@ -1316,134 +1335,134 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "祗有管理者才能分歧版本庫" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 #, fuzzy msgid "Non-admins can fork repositories" msgstr "建立版本庫" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "未審核" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "審核中" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "" @@ -1469,304 +1488,316 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:169 +#, 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:170 #, 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:171 -#, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "關閉中" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, 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 +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "SSH key %r not found" +msgstr "尚未有任何變更" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "您無法移除這個使用者，因為係供整個應用使用" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, 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 +#: kallithea/model/user.py:260 #, 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 +#: kallithea/model/user.py:267 #, 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 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:409 #, 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 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "" +#: kallithea/model/validators.py:72 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:74 #, python-format -msgid "Username \"%(username)s\" already exists" +msgid "Username \"%(username)s\" cannot be used" msgstr "" #: kallithea/model/validators.py:76 -#, python-format -msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:78 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:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: 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 "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" "使用者羣組名稱可以包括文數字字元、底線、句點或破折號，必須以文數字啟頭" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" +#: kallithea/model/validators.py:175 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:177 #, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:179 -#, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "密碼不相符" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "無效的用戶名稱或密碼" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "無效的版本庫 URL" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 #, fuzzy msgid "This email address is already in use" msgstr "這個郵件位址已經使用了" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 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:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1807,24 +1838,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "描述" @@ -1841,7 +1878,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1849,11 +1886,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "擁有者" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "" @@ -1868,7 +1905,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1876,7 +1913,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "密碼" @@ -2037,10 +2074,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "動作" @@ -2089,22 +2128,22 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "儲存" @@ -2123,14 +2162,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 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:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2138,36 +2177,25 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "啟用統計" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "啟用下載" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 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:78 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "" - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2214,8 +2242,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 #, fuzzy msgid "Never" msgstr "擁有者" @@ -2249,7 +2279,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "" @@ -2285,23 +2315,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2329,7 +2361,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2389,7 +2421,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "我的帳號" @@ -2402,26 +2434,31 @@ msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "SSH Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 #, fuzzy msgid "Owned Repositories" msgstr "個版本庫" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 #, fuzzy msgid "Show Permissions" msgstr "權限" @@ -2449,7 +2486,9 @@ msgstr "確認移除目前的統計" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 #, fuzzy msgid "Remove" msgstr "移除檔案" @@ -2466,12 +2505,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "" @@ -2575,6 +2616,46 @@ msgid "Name" msgstr "名稱" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "姓" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +msgid "Confirm to remove this SSH key: %s" +msgstr "確認移除目前的統計" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +msgid "New SSH key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public repository" +msgid "Public key" +msgstr "公開的版本庫" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 #, fuzzy msgid "Repositories You are Watching" @@ -2593,7 +2674,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "" @@ -2632,7 +2713,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2793,7 +2874,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "" @@ -2903,17 +2984,11 @@ "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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "" @@ -2945,14 +3020,14 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -2962,7 +3037,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" @@ -3014,8 +3089,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "統計" @@ -3052,74 +3127,32 @@ "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -#, fuzzy -msgid "Change Locking" -msgstr "修改紀錄" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #, fuzzy -msgid "Confirm to unlock repository." -msgstr "確認廢止版本庫快取" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -#, fuzzy -msgid "Unlock Repository" -msgstr "公開的版本庫" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, fuzzy -msgid "Confirm to lock repository." -msgstr "確認廢止版本庫快取" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -#, fuzzy -msgid "Lock Repository" -msgstr "公開的版本庫" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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:68 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 -#, fuzzy msgid "Delete this Repository" msgstr "公開的版本庫" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, 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:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3223,20 +3256,12 @@ msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 #, fuzzy -msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3246,32 +3271,32 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 #, fuzzy msgid "Remote repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 #, fuzzy msgid "Repository URL" msgstr "版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 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 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "" @@ -3384,8 +3409,8 @@ 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 #, fuzzy msgid "Save Settings" msgstr "儲存設定" @@ -3484,10 +3509,6 @@ msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Check for updates" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" @@ -3508,15 +3529,7 @@ msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "" @@ -3525,48 +3538,40 @@ msgstr "push 後顯示版本庫大小" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "紀錄使用者推送命令" +msgid "Update repository after push (hg update)" +msgstr "push後更新版本庫 (hg update)" #: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "紀錄使用者抓取命令" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 -msgid "Update repository after push (hg update)" -msgstr "push後更新版本庫 (hg update)" - -#: kallithea/templates/admin/settings/settings_vcs.html:33 #, fuzzy msgid "Mercurial extensions" msgstr "Mercurial 版本庫" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 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/templates/admin/settings/settings_vcs.html:47 #, fuzzy msgid "Location of repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 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/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -3615,9 +3620,8 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 #, fuzzy -msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "複製連結" #: kallithea/templates/admin/settings/settings_visual.html:43 @@ -3635,59 +3639,75 @@ " {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 +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +msgid "SSH Clone URL" +msgstr "複製連結" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "repositories" msgid "Repository page size" msgstr "個版本庫" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:62 +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/templates/admin/settings/settings_visual.html:100 #, fuzzy msgid "Meta Tagging" msgstr "設定" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html: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/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "" @@ -3851,12 +3871,12 @@ msgstr "" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Mercurial 版本庫" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Git 版本庫" @@ -3904,158 +3924,132 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "搜尋" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "分支" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "公開日誌" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" -msgstr "公開日誌" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" +msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "忘記密碼?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "沒有帳號?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "登出" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "個版本庫" +msgid "Create repositories" +msgstr "建立版本庫" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "預設權限" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "建立版本庫" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -4795,7 +4789,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -4807,7 +4801,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -4861,7 +4855,7 @@ msgstr "載入檔案列表..." #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "大小" @@ -4991,8 +4985,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "追蹤者" @@ -5043,8 +5037,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5358,9 +5352,9 @@ msgid "File names" msgstr "檔案名稱" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "權限不足" @@ -5370,20 +5364,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "" @@ -5392,12 +5386,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "檔案" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "" @@ -5438,97 +5432,145 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "複製由" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +#, fuzzy +msgid "Clone URL" +msgstr "複製連結" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "姓" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "下載" -#: kallithea/templates/summary/summary.html:101 +#: kallithea/templates/summary/summary.html:109 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:111 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: kallithea/templates/summary/summary.html:109 +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 #, fuzzy msgid "Latest Changes" msgstr "多個檔案修改" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 #, fuzzy msgid "Quick Start" msgstr "快速過濾..." -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "私有版本庫" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" +#~ msgid "Repository has been locked" +#~ msgstr "儲存所已被鎖定" + +#~ msgid "Repository has been unlocked" +#~ msgstr "儲存所已打開" + +#, fuzzy +#~ msgid "Change Locking" +#~ msgstr "修改紀錄" + +#, fuzzy +#~ msgid "Confirm to unlock repository." +#~ msgstr "確認廢止版本庫快取" + +#, fuzzy +#~ msgid "Unlock Repository" +#~ msgstr "公開的版本庫" + +#, fuzzy +#~ msgid "Confirm to lock repository." +#~ msgstr "確認廢止版本庫快取" + +#, fuzzy +#~ msgid "Lock Repository" +#~ msgstr "公開的版本庫" + +#~ msgid "Log user push commands" +#~ msgstr "紀錄使用者推送命令" + +#~ msgid "Log user pull commands" +#~ msgstr "紀錄使用者抓取命令" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "個版本庫" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "預設權限" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" @@ -5584,9 +5626,6 @@ #~ msgid "invalid user name" #~ msgstr "無效的使用者名稱" -#~ msgid "Your account is disabled" -#~ msgstr "您的帳號已被停用" - #~ msgid "invalid clone URL" #~ msgstr "無效的複製URL"