Mercurial > kallithea
changeset 4957:5e7bdfbef29b
i18n: update translations with the newly extracted strings
| author | Andrew Shadura <andrew@shadura.me> |
|---|---|
| date | Wed, 01 Apr 2015 03:50:15 +0200 |
| parents | 699689c31e0c |
| children | ab47e5e9ad77 |
| files | kallithea/i18n/cs/LC_MESSAGES/kallithea.po kallithea/i18n/de/LC_MESSAGES/kallithea.po kallithea/i18n/en/LC_MESSAGES/kallithea.po kallithea/i18n/fr/LC_MESSAGES/kallithea.po kallithea/i18n/hu/LC_MESSAGES/kallithea.po kallithea/i18n/ja/LC_MESSAGES/kallithea.po kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po kallithea/i18n/pl/LC_MESSAGES/kallithea.po kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po kallithea/i18n/ru/LC_MESSAGES/kallithea.po kallithea/i18n/sk/LC_MESSAGES/kallithea.po kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po |
| diffstat | 13 files changed, 30055 insertions(+), 26394 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -1,13 +1,13 @@ -# Translations template for Kallithea. +# Czech translations for Kallithea. # Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. # Automatically generated, 2014. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 2.2.5\n" -"Report-Msgid-Bugs-To: marcin@maq.io\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"Project-Id-Version: Kallithea\n" +"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2015-02-13 15:26+0200\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Czech " @@ -17,79 +17,80 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.2-dev\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "Všechny větve" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(zavřeno)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:94 -#: kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "Taková revize neexistuje" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "Změna stavu-> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "" + +#: kallithea/controllers/changeset.py:382 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" - -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +"Changing status on a changeset associated with a closed pull request is " +"not allowed" +msgstr "" + +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "Hlavní stránka" +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:99 +msgid "Unauthorized access to resource" +msgstr "" #: kallithea/controllers/error.py:101 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:104 -msgid "Unauthorized access to resource" -msgstr "" - -#: kallithea/controllers/error.py:106 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:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -106,12 +107,12 @@ msgstr "" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "" @@ -129,215 +130,286 @@ msgid "There are no files yet. %s" msgstr "Zatím nejsou žádné soubory. %s" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, python-format +msgid "%s at %s" +msgstr "" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "Žádné změny" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "Přidaný soubor přes Kallithea" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "Žádný obsah" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "Stahování vypnuto" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Neznámá revize %s" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "Prázdný repozitář" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "Změny" -#: kallithea/controllers/files.py:776 -#: kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Větve" -#: kallithea/controllers/files.py:777 -#: kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tagy" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repozitáře" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "špatná captcha" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" -"Your password reset was successful, new password has been sent to your email" -msgstr "" - -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" -msgstr "" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" + +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(zavřeno)" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +msgid "Pull request update created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:503 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "" - -#: kallithea/controllers/pullrequests.py:522 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +msgid "Closing." msgstr "" #: kallithea/controllers/search.py:135 @@ -349,23 +421,25 @@ msgstr "" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" -msgstr "" - -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" -msgstr "" - -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#, fuzzy +msgid "An error occurred during search operation." +msgstr "Došlo k chybě při vytváření gist" + +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +msgid "No data ready yet" +msgstr "" + +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" @@ -373,68 +447,68 @@ msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" -msgstr "" +msgid "5 minutes" +msgstr "5 minut" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" -msgstr "5 minut" +msgid "1 hour" +msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" -msgstr "1 hodina" +msgid "1 day" +msgstr "1 den" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "1 den" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "1 měsíc" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "Došlo k chybě při vytváření gist" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -443,62 +517,55 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 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:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 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:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -514,28 +581,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "" @@ -557,26 +624,26 @@ msgstr "" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "" @@ -592,21 +659,21 @@ msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "" @@ -636,182 +703,182 @@ msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 -msgid "Updated repository visibility in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:526 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "Nic" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "Odemčeno" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "Zamčeno" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:618 -msgid "Cache invalidation successful" -msgstr "" - #: kallithea/controllers/admin/repos.py:622 +msgid "Cache invalidation successful" +msgstr "" + +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" #: kallithea/controllers/admin/settings.py:270 @@ -830,23 +897,23 @@ msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:414 -msgid "Updated hooks" -msgstr "" - #: kallithea/controllers/admin/settings.py:418 +msgid "Updated hooks" +msgstr "" + +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "" @@ -855,284 +922,286 @@ msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" #: kallithea/lib/diffs.py:82 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "" -#: kallithea/lib/helpers.py:743 -msgid "[deleted] repository" -msgstr "" - -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 -msgid "[created] repository" -msgstr "" - -#: kallithea/lib/helpers.py:747 -msgid "[created] repository as fork" -msgstr "" - -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 -msgid "[forked] repository" -msgstr "" - -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 -msgid "[updated] repository" -msgstr "" - -#: kallithea/lib/helpers.py:753 -msgid "[downloaded] archive from repository" -msgstr "" - -#: kallithea/lib/helpers.py:755 -msgid "[delete] repository" -msgstr "" - -#: kallithea/lib/helpers.py:763 -msgid "[created] user" -msgstr "" - -#: kallithea/lib/helpers.py:765 -msgid "[updated] user" -msgstr "" - -#: kallithea/lib/helpers.py:767 -msgid "[created] user group" -msgstr "" - -#: kallithea/lib/helpers.py:769 -msgid "[updated] user group" -msgstr "" - #: kallithea/lib/helpers.py:771 -msgid "[commented] on revision in repository" -msgstr "" - -#: kallithea/lib/helpers.py:773 -msgid "[commented] on pull request for" +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 +msgid "[created] repository" msgstr "" #: kallithea/lib/helpers.py:775 -msgid "[closed] pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:777 -msgid "[pushed] into" -msgstr "" - -#: kallithea/lib/helpers.py:779 -msgid "[committed via Kallithea] into repository" +msgid "[created] repository as fork" +msgstr "" + +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 +msgid "[forked] repository" +msgstr "" + +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 +msgid "[updated] repository" msgstr "" #: kallithea/lib/helpers.py:781 -msgid "[pulled from remote] into repository" +msgid "[downloaded] archive from repository" msgstr "" #: kallithea/lib/helpers.py:783 +msgid "[delete] repository" +msgstr "" + +#: kallithea/lib/helpers.py:791 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:793 +msgid "[updated] user" +msgstr "" + +#: kallithea/lib/helpers.py:795 +msgid "[created] user group" +msgstr "" + +#: kallithea/lib/helpers.py:797 +msgid "[updated] user group" +msgstr "" + +#: kallithea/lib/helpers.py:799 +msgid "[commented] on revision in repository" +msgstr "" + +#: kallithea/lib/helpers.py:801 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:803 +msgid "[closed] pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:805 +msgid "[pushed] into" +msgstr "" + +#: kallithea/lib/helpers.py:807 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:809 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, 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:415 +"%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:425 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1140,7 +1209,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1148,7 +1217,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1156,7 +1225,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1164,7 +1233,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1172,7 +1241,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1180,32 +1249,62 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1215,12 +1314,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1230,162 +1329,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" +msgid "Repository Group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" +msgid "Register new user with Kallithea with manual activation" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1395,12 +1494,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1410,52 +1509,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1464,8 +1557,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1476,23 +1569,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1500,8 +1580,19 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1511,8 +1602,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1522,19 +1613,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1544,21 +1624,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1566,32 +1646,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1599,49 +1690,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:77 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "" @@ -1667,254 +1735,298 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +msgid "Closing" +msgstr "" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:276 +#: kallithea/model/user.py:261 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:268 +#, 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:275 #, 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:304 +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:151 +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:139 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:158 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:177 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" +#: kallithea/model/validators.py:291 +msgid "Passwords do not match" +msgstr "" + +#: kallithea/model/validators.py:308 +msgid "invalid password" +msgstr "" + +#: kallithea/model/validators.py:309 +msgid "invalid user name" +msgstr "" + #: kallithea/model/validators.py:310 -msgid "Passwords do not match" -msgstr "" - -#: kallithea/model/validators.py:327 -msgid "invalid password" -msgstr "" - -#: kallithea/model/validators.py:328 -msgid "invalid user name" -msgstr "" - -#: kallithea/model/validators.py:329 msgid "Your account is disabled" msgstr "" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" -msgstr "" - -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" - -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:474 +msgid "invalid clone URL" +msgstr "" + +#: kallithea/model/validators.py:475 +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +msgstr "" + +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 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:804 +"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:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1925,35 +2037,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "" #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -1970,165 +2083,165 @@ msgstr "" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:126 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - #: kallithea/templates/index_base.html:129 +#: kallithea/templates/admin/my_account/my_account_repos.html:46 +#: kallithea/templates/admin/my_account/my_account_watched.html:46 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 +#: kallithea/templates/admin/repos/repo_add_base.html:9 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 +#: kallithea/templates/base/perms_summary.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:49 +#: kallithea/templates/bookmarks/bookmarks_data.html:7 +#: kallithea/templates/branches/branches.html:49 +#: kallithea/templates/branches/branches_data.html:7 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 +#: kallithea/templates/tags/tags_data.html:7 +msgid "Name" +msgstr "" + +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:143 -msgid "No repositories found." -msgstr "" - #: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 -msgid "Data error." +#: kallithea/templates/admin/my_account/my_account_repos.html:57 +#: kallithea/templates/admin/my_account/my_account_watched.html:57 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 +msgid "Click to sort ascending" msgstr "" #: kallithea/templates/index_base.html:145 +#: kallithea/templates/admin/my_account/my_account_repos.html:58 +#: kallithea/templates/admin/my_account/my_account_watched.html:58 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/index_base.html:146 +msgid "No repositories found." +msgstr "" + +#: kallithea/templates/index_base.html:147 +#: kallithea/templates/admin/my_account/my_account_repos.html:60 +#: kallithea/templates/admin/my_account/my_account_watched.html:60 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 +msgid "Data error." +msgstr "" + +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 -#: kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "" -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "" @@ -2136,78 +2249,82 @@ msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, python-format +msgid "Reset Your Password to %s" +msgstr "" + +#: kallithea/templates/password_reset.html:14 +msgid "Reset Your Password" +msgstr "" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" -msgstr "" - -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/password_reset.html:46 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +msgid "" +"Password reset link will be sent to the email address matching your " +"username." +msgstr "" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "" @@ -2226,25 +2343,25 @@ msgstr "" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +msgid "Admin Journal" +msgstr "" + +#: kallithea/templates/admin/admin.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -msgid "journal filter..." -msgstr "" - -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" -msgstr "" - -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -2252,13 +2369,13 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "" @@ -2268,11 +2385,11 @@ msgstr "" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2289,160 +2406,161 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" +msgstr "Repozitáře" + +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2450,75 +2568,69 @@ msgid "never" msgstr "" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2526,118 +2638,113 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +msgid "My Permissions" msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2708,7 +2815,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2729,7 +2835,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2738,7 +2844,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" +msgid "Change Your Account Password" msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:7 @@ -2754,115 +2860,76 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:11 -msgid "Avatars are disabled" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:13 -msgid "Missing email, please update your user email address." +#: kallithea/templates/admin/users/user_edit_profile.html:9 +msgid "Using" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/users/user_edit_profile.html:11 +msgid "Avatars are disabled" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:15 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be managed " -"here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" +"Your user is in an external Source of Record; some details cannot be " +"managed here" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" -msgstr "" +#, fuzzy +msgid "Repositories You Own" +msgstr "Umístění repozitářů" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" -msgstr "" +#, fuzzy +msgid "Repositories You are Watching" +msgstr "Umístění repozitářů" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +msgid "Mark All Read" msgstr "" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2870,38 +2937,38 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:11 +msgid "Show Notification" +msgstr "" + +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +msgid "Permissions Administration" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "" @@ -2912,15 +2979,15 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2933,7 +3000,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "" @@ -2966,8 +3033,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2987,7 +3054,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -2998,7 +3065,7 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +msgid "All IP addresses are allowed." msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -3007,69 +3074,63 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +msgid "Default User Permissions Overview" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 #, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +msgid "%s Repository Group Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "Nastavení" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "Pokročilé" @@ -3093,7 +3154,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "" @@ -3189,8 +3250,17 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 @@ -3198,28 +3268,20 @@ msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" +msgid "Repository Groups Administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +msgid "Number of Top-level Repositories" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:14 @@ -3227,24 +3289,24 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +msgid "Optional URL from which repository should be cloned." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/forks/fork.html:42 +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3253,7 +3315,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "" @@ -3264,164 +3326,168 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +#, fuzzy, python-format +msgid "%s Creating Repository" +msgstr "Chyba při vytváření repozitáře %s" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" -"Repository \"%(repo_name)s\" is being created, you will be redirected when " -"this process is finished.repo_name" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:42 +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" +msgid "Remote" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:58 -msgid "Remote" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +msgid "Public Journal Visibility" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +msgid "Add to Public Journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 msgid "" -"All actions made on this repository will be accessible to everyone in public " -"journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "Prázdný repozitář" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." +msgstr "Prázdný repozitář" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "Prázdný repozitář" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Triggering a pull locks repository by user who pulled, only the same user can " -"unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "Prázdný repozitář" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be inaccessible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +msgid "Invalidate Repository Cache" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +msgid "Confirm to invalidate repository cache." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3434,12 +3500,12 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "" @@ -3473,7 +3539,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" +msgid "Extra fields are disabled." msgstr "" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 @@ -3481,19 +3547,19 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" +msgid "Remote URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +msgid "Pull Changes from Remote Location" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +msgid "Confirm to pull changes from remote side." msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3501,7 +3567,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3511,15 +3577,16 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" " Useful for CI systems, or any other cases " -"that you need to hardcode the url into 3rd party service." +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" +#: kallithea/templates/summary/summary.html:72 +msgid "Clone URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 @@ -3540,15 +3607,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." +msgid "URL used for doing remote pulls." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" @@ -3565,47 +3627,48 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" +msgid "Reset Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +msgid "Confirm to remove current statistics." msgstr "" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" -msgstr "" - -#: kallithea/templates/admin/repos/repos.html:54 +#, fuzzy +msgid "Repositories Administration" +msgstr "Umístění repozitářů" + +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:40 +msgid "Settings Administration" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3674,48 +3737,55 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" -msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" +msgstr "Nastavení" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:69 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "" @@ -3729,8 +3799,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in the " -"database check this option to scan obsolete data in database and remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3738,19 +3808,17 @@ msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option selected. " -"Use this to reload data and clear cache keys." +msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3767,7 +3835,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3792,11 +3860,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" +msgid "Git version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3804,7 +3872,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3812,7 +3880,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3825,8 +3893,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3846,7 +3914,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +msgid "Mercurial extensions" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3859,24 +3927,25 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "Umístění repozitářů" +#, fuzzy +msgid "Location of repositories" +msgstr "Chyba při vytváření repozitáře %s" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this " -"value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3905,27 +3974,29 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following variables " -"of the URL will be replaced accordingly.\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" +"Gravatar URL allows you to use another avatar server application.\n" +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" " {email} user " "email,\n" -" {md5email} md5 hash " -"of the user email (like at gravatar.com),\n" -" {size} size of " -"the image that is expected from the server application,\n" -" {netloc} network " -"location/server host of running Kallithea server" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', " -"available vars:\n" -" {scheme} 'http' or " -"'https' sent from running Kallithea server,\n" +"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 " @@ -3936,71 +4007,72 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:64 +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -4010,19 +4082,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "" @@ -4041,7 +4108,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "" @@ -4049,23 +4116,15 @@ msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_groups.html:13 +msgid "User Groups Administration" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4073,18 +4132,19 @@ msgid "Add user" msgstr "" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "" @@ -4093,14 +4153,14 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "Default Permissions" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4112,6 +4172,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4145,8 +4206,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4158,193 +4219,183 @@ msgstr "" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" -msgstr "" - -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" +msgid "Users Administration" msgstr "" #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 +msgid "Options" +msgstr "" + #: kallithea/templates/base/base.html:158 -msgid "Options" +#: kallithea/templates/forks/forks_data.html:21 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:13 +#: kallithea/templates/branches/branches.html:56 +#: kallithea/templates/branches/branches_data.html:13 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:13 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 +msgid "Search" msgstr "" #: kallithea/templates/base/base.html:166 -#: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +msgid "Unlock" msgstr "" #: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "" - -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 -msgid "Search" -msgstr "" - -#: kallithea/templates/base/base.html:174 -msgid "Unlock" +msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:241 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:243 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:244 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:292 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:299 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4355,8 +4406,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4405,85 +4456,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" -msgstr "" - -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" -msgstr "" - -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Open New Pull Request for Selected Changesets" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +msgid "Show Selected Changeset __S" +msgstr "" + +#: kallithea/templates/base/root.html:35 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" +#: kallithea/templates/base/root.html:39 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:43 +msgid "Specify changeset" msgstr "" #: kallithea/templates/bookmarks/bookmarks.html:5 @@ -4491,26 +4541,29 @@ msgid "%s Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "" @@ -4520,7 +4573,7 @@ msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4537,193 +4590,198 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "Prázdný repozitář" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4731,9 +4789,9 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4741,123 +4799,154 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "Změna stavu-> %s" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +msgid "No title" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +msgid "Comment from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 -msgid "Commenting on line {1}." +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +msgid "Commenting on line {1}." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "" -"Use @username inside this text to send notification to this Kallithea user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +msgid "Use @username inside this text to notify another user" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +msgid "Submitting ..." +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +msgid "Use @username inside this text to send notification to another local user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" +msgstr "Změny" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "Žádné změny" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(zavřeno)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4865,12 +4954,12 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" +#: kallithea/templates/changeset/diff_block.html:87 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:90 +msgid "Renamed" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 @@ -4881,30 +4970,53 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "Změny" + +#: kallithea/templates/compare/compare_cs.html:85 +msgid "behind" +msgstr "" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4913,38 +5025,43 @@ msgstr[2] "" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "" @@ -4953,17 +5070,22 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 @@ -4971,11 +5093,11 @@ msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "" @@ -4983,66 +5105,50 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +#: kallithea/templates/email_templates/pull_request.html:5 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "" @@ -5052,85 +5158,82 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" -msgstr "" - -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" +msgstr "Žádné změny" + +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 -msgid "Search File List" -msgstr "" - -#: kallithea/templates/files/files_browser.html:29 -msgid "Loading file list..." -msgstr "" - -#: kallithea/templates/files/files_browser.html:42 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:43 -msgid "Mimetype" -msgstr "" - #: kallithea/templates/files/files_browser.html:44 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:48 +msgid "Loading file list..." +msgstr "" + +#: kallithea/templates/files/files_browser.html:61 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:62 +msgid "Mimetype" +msgstr "" + +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" -msgstr "" - -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:64 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +msgid "Last Committer" msgstr "" #: kallithea/templates/files/files_delete.html:4 @@ -5138,8 +5241,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5148,32 +5251,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5219,12 +5318,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "" @@ -5245,9 +5344,9 @@ msgid "%s Followers" msgstr "" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "" @@ -5260,31 +5359,35 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5293,9 +5396,9 @@ msgid "%s Forks" msgstr "" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "" @@ -5303,102 +5406,159 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" -msgstr "" - -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" +msgstr "Prázdný repozitář" + +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:44 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +msgid "Pull Request Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, python-format +msgid "Latest vote: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request #%s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +msgid "Summarize the changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5406,29 +5566,80 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "Zatím nejsou žádné soubory. %s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +msgid "on" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +msgid "Created by" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "Update" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +msgid "Save as New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "Žádné změny" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 @@ -5436,32 +5647,42 @@ msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 @@ -5470,27 +5691,27 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" -msgstr "" - -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:16 +msgid "Search in All Repositories" +msgstr "" + +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "" +#: kallithea/templates/search/search.html:62 +msgid "Search in" +msgstr "" + #: kallithea/templates/search/search.html:65 -msgid "Search in" -msgstr "" - -#: kallithea/templates/search/search.html:68 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "" @@ -5505,67 +5726,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:389 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:390 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "" + #: kallithea/templates/summary/statistics.html:392 -msgid "commits" -msgstr "" - -#: kallithea/templates/summary/statistics.html:393 -msgid "files added" +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" +msgid "commit" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "" @@ -5574,78 +5795,79 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:111 +msgid "Download" +msgstr "" + #: kallithea/templates/summary/summary.html:115 -msgid "Download" -msgstr "" - -#: kallithea/templates/summary/summary.html:119 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" -msgstr "" - -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" -msgstr "" - -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" +msgstr "Změna stavu-> %s" + +#: kallithea/templates/summary/summary.html:191 +msgid "Quick Start" +msgstr "" + +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "" @@ -5655,6 +5877,7 @@ msgid "%s Tags" msgstr "" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" -msgstr "" +#: kallithea/templates/tags/tags.html:26 +msgid "Compare Tags" +msgstr "" +
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -7,91 +7,94 @@ msgstr "" "Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2015-03-31 17:00+0200\n" "Last-Translator: Peter Vitt <petervitt@web.de>\n" "Language-Team: German " "<https://hosted.weblate.org/projects/kallithea/kallithea/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.3-dev\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "Es gibt noch keine Änderungssätze" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "Alle Branches" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Keine" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(geschlossen)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "Zeige unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignoriere unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "diff-Kontext auf %(num)s Zeilen erhöhen" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "Die angegebene Version existiert nicht in diesem Repository" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "Statusänderung -> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "%d Kommentar" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" -"Eine Änderung des Status eines Änderungssatzes, der mit einem geschlossen " -"Pull-Request assoziert ist, ist nicht erlaubt" - -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +"Eine Änderung des Status eines Änderungssatzes, der mit einem geschlossen" +" Pull-Request assoziert ist, ist nicht erlaubt" + +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "Änderungssätze auswählen" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "Startseite" - -#: kallithea/controllers/error.py:101 +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Die Anfrage konnte vom Server nicht ausgewertet werden weil sie einen " "Ungültigen Syntax nutzt." -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:99 msgid "Unauthorized access to resource" msgstr "Unauthorisierter Zugang zur Ressource" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:101 msgid "You don't have permission to view this page" msgstr "Du hast keine Rechte, um diese Seite zu betrachten" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "Die Ressource konnte nicht gefunden werden" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -110,12 +113,12 @@ msgstr "%s %s Feed" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten..." @@ -133,161 +136,166 @@ msgid "There are no files yet. %s" msgstr "Es gibt hier noch keine Dateien. %s" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, fuzzy, python-format +msgid "%s at %s" +msgstr "in %s und %s" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, 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:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Datei %s via Kallithea gelöscht" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "Datei %s erfolgreich gelöscht" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "Während des Commitens trat ein Fehler auf" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "Datei %s via Kallithea editiert" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "Keine Änderungen" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "Der Commit zu %s war erfolgreich" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "Datei via Kallithea hinzugefügt" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "Kein Inhalt" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "Kein Dateiname" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 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:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "Downloads gesperrt" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "Leeres Repository" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "Unbekannter Archiv Typ" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "Änderungssätze" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Entwicklungszweige" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "Währen des Forken des Repositorys trat ein Fehler auf: %s" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "Gruppen" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "Marke" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "Lesezeichen" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "Öffentliches Logbuch" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "Logbuch" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "falsches Captcha" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "Sie haben sich erfolgreich bei Kallithea registriert" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "Ihr Passwort Zurücksetzen link wurde versendet" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" @@ -295,57 +303,127 @@ "Das Zurücksetzen des Passworted war erfolgreich, ein neues Passwort wurde" " an ihre EMail Addresse gesendet" -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "Änderungssatz" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" -msgstr "Spezial" +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(geschlossen)" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "Änderungssatz" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "Spezial" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Lesezeichen" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "Pull-Requests benötigen einen Title mit mindestens 3 Zeichen" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "Fehler beim Erstellen des Pull-Requests: %s" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +#, fuzzy +msgid "No description" +msgstr "Beschreibung" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +#, fuzzy +msgid "Error occurred while creating pull request" msgstr "Währen des abschicken des Pullrequests trat ein Fehler auf" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +msgid "Pull request update created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:503 +#, fuzzy +msgid "Pull request updated" +msgstr "Pull Request" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "Erfolgreich Pull-Request gelöscht" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +#, fuzzy +msgid "Closing." msgstr "Schließen mit" -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" -"Es ist verboten, Pull-Requests bei einem anderem Status als 'abgelehnt' oder " -"'angenommen' zu schließen" - #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "Ungültige Suchanfrage. Versuchen sie es in Anführungzeichen zu setzen." @@ -355,23 +433,26 @@ msgstr "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer ausführen" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" +#, fuzzy +msgid "An error occurred during search operation." msgstr "Während dieser Such Operation trat ein Fehler auf" -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +#, fuzzy +msgid "No data ready yet" msgstr "Es wurden bisher keine Daten geladen" -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "Statistiken sind deaktiviert für dieses Repository" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "Anmeldeeinstellungen erfolgreich geändert" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "Fehler bei der Änderung der Anmeldeeinstellungen aufgetreten" @@ -379,68 +460,68 @@ msgid "Default settings updated successfully" msgstr "Standardeinstellungen erfolgreich geupdated" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "Ein Fehler trat beim updaten der Standardeinstellungen auf" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "immer" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" -msgstr "immer" +msgid "5 minutes" +msgstr "5 Minuten" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" -msgstr "5 Minuten" +msgid "1 hour" +msgstr "1 Stunde" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" -msgstr "1 Stunde" +msgid "1 day" +msgstr "1 Tag" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "1 Tag" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "1 Monat" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "Lebenszeit" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "Ein fehler trat auf bei der Erstellung des gist" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "gist %s gelöscht" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "ungeändert" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "Erfolgreich Kerninhalt aktualisiert" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "Erfolgreich Kerndaten aktualisiert" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "Fehler beim Aktualisieren der Kerndaten %s" @@ -451,62 +532,55 @@ "Sie können diesen Benutzer nicht editieren, da er von entscheidender " "Bedeutung für die ganze Applikation ist" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "Fehler beim Aktualisieren der Benutzer %s" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "Erfolgreich Kennwort geändert" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "Fehler bei der Änderung des Kennworts" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "Die EMail Addresse %s wurde zum Benutzer hinzugefügt" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 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:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "Die EMail Addresse wurde vom Benutzer entfernt" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "API Key wurde erfolgreich erstellt" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "API-Schlüssel erfolgreich zurückgesetzt" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "API-Schlüssel erfolgreich gelöscht" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Keine" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -522,28 +596,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "Admin" @@ -565,26 +639,26 @@ msgstr "Erlaubt mit automatischer Kontoaktivierung" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "Manuelle Aktivierung externen Kontos" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "Automatische Aktivierung externen Kontos" @@ -600,21 +674,21 @@ msgid "Global permissions updated successfully" msgstr "Globale Berechtigungen erfolgreich geändert" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Fehler bei der Änderung der globalen Berechtigungen" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "Repositoriumsgruppe %s erstellt" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, 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:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "Repositoriumsgruppe %s aktualisiert" @@ -644,190 +718,190 @@ msgid "Error occurred during deletion of repository group %s" msgstr "Fehler beim Löschen der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "Fehler beim Entzug der Berechtigungen" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "Fehler beim Erstellen des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "Repositorium %s von %s erstellt" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "Aufgespaltenes Repositorium %s zu %s" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "Repositorium erzeugt %s" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "Fehler bei der Aktualisierung des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "%s Spaltung abgetrennt" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "%s Spaltung gelöscht" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "Repositorium %s gelöscht" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "%s konnte nicht gelöscht werden da es immernoch Forks enthält" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, 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:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "Repositoriumsberechtigungen aktualisiert" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "Fehler während der Erzeugung des Feldes" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "Fehler beim Entfernen des Feldes" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "-- Keine Abspaltung --" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:526 msgid "Updated repository visibility in public journal" msgstr "Sichtbarkeit des Repositorys im Öffentlichen Logbuch aktualisiert" -#: kallithea/controllers/admin/repos.py:526 +#: kallithea/controllers/admin/repos.py:530 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:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "Schlüssel stimmt nicht überein" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "Nichts" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "Während dieser operation trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "Gesperrtes Repositorium" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "Entsperrtes Repositorium" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "Fehler beim Entsperren" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "Entsperrt" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "Gesperrt" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "Repositorium wurde %s" -#: kallithea/controllers/admin/repos.py:618 +#: kallithea/controllers/admin/repos.py:622 msgid "Cache invalidation successful" msgstr "Cache Entfernung war erfolgreich" -#: kallithea/controllers/admin/repos.py:622 +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "Währen der Cache Invalidierung trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "Von entferntem Ort übertragen" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 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:673 +#: kallithea/controllers/admin/repos.py:677 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:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "VCS-Einstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -"hgsubversion-Unterstützung konnte nicht aktiviert werden. Die \"" -"hgsubversion\"-Bibliothek fehlt" - -#: kallithea/controllers/admin/settings.py:182 +"hgsubversion-Unterstützung konnte nicht aktiviert werden. Die " +"\"hgsubversion\"-Bibliothek fehlt" + +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen " "aufgetreten" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, fuzzy, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Die Repositories wurden erfolgreich erneut überprüft hinzugefügt: %s ; " "entfernt: %s" @@ -850,23 +924,23 @@ msgid "Please enter email address" msgstr "Bitte gebe eine E-Mailadresse an" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:418 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "Während der Erzeugung des Hooks ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" @@ -875,107 +949,114 @@ msgid "Created user group %s" msgstr "Nutzergruppe %s erstellt" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, 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:199 +msgstr "Es ist ein Fehler während der Erstellung der Nutzergruppe %s aufgetreten" + +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "Aktualisierte Nutzergruppe %s" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, 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:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "Die Nutzergruppe wurde erfolgreich entfernt" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 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:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "Berechtigungen der Benutzergruppe wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "Berechtigungen wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "Es ist ein Fehler während des Speicherns der Berechtigungen aufgetreten" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "Nutzer %s erstellt" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "Während des Erstellens des Benutzers %s ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "Der Benutzer wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "Der Nutzer wurde erfolgreich gelöscht" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "Während der Löschen des Benutzers trat ein Fehler auf" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "Sie können diesen Benutzer nicht editieren" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "Die IP %s wurde zur Nutzerwhitelist hinzugefügt" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "IP wurde von der Nutzerwhitelist entfernt" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "IP %s ist nicht erlaubt" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 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:846 +#: kallithea/lib/auth.py:843 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:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "Änderungssatz nicht gefunden" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Binäre Datei" @@ -990,163 +1071,158 @@ msgid "No changes detected" msgstr "Keine Änderungen erkannt" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "Branch %s gelöscht" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "Tag %s erstellt" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "Änderungssatz nicht gefunden" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Zeige alle Kombinierten Änderungensätze %s->%s" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "vergleichsansicht" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "und" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "%s mehr" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "revisionen" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "Fork Name %s" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:771 msgid "[deleted] repository" msgstr "[gelöscht] Repository" -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 msgid "[created] repository" msgstr "[erstellt] Repository" -#: kallithea/lib/helpers.py:747 +#: kallithea/lib/helpers.py:775 msgid "[created] repository as fork" msgstr "[erstellt] Repository als Fork" -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 msgid "[forked] repository" msgstr "[forked] Repository" -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 msgid "[updated] repository" msgstr "[aktualisiert] Repository" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:781 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:755 -msgid "[delete] repository" -msgstr "[gelöscht] Repository" - -#: kallithea/lib/helpers.py:763 -msgid "[created] user" -msgstr "[erstellt] Benutzer" - -#: kallithea/lib/helpers.py:765 -msgid "[updated] user" -msgstr "[akutalisiert] Benutzer" - -#: kallithea/lib/helpers.py:767 -msgid "[created] user group" -msgstr "[erstellt] Nutzergruppe" - -#: kallithea/lib/helpers.py:769 -msgid "[updated] user group" -msgstr "[aktualisiert] Nutzergruppe" - -#: kallithea/lib/helpers.py:771 -msgid "[commented] on revision in repository" -msgstr "[kommentiert] revision in Repository" - -#: kallithea/lib/helpers.py:773 -msgid "[commented] on pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:775 -msgid "[closed] pull request for" -msgstr "[geschlossen] Pull Request für" - -#: kallithea/lib/helpers.py:777 -msgid "[pushed] into" -msgstr "[übermittelt] in" - -#: kallithea/lib/helpers.py:779 -msgid "[committed via Kallithea] into repository" -msgstr "" - -#: kallithea/lib/helpers.py:781 -msgid "[pulled from remote] into repository" -msgstr "" - #: kallithea/lib/helpers.py:783 +msgid "[delete] repository" +msgstr "[gelöscht] Repository" + +#: kallithea/lib/helpers.py:791 +msgid "[created] user" +msgstr "[erstellt] Benutzer" + +#: kallithea/lib/helpers.py:793 +msgid "[updated] user" +msgstr "[akutalisiert] Benutzer" + +#: kallithea/lib/helpers.py:795 +msgid "[created] user group" +msgstr "[erstellt] Nutzergruppe" + +#: kallithea/lib/helpers.py:797 +msgid "[updated] user group" +msgstr "[aktualisiert] Nutzergruppe" + +#: kallithea/lib/helpers.py:799 +msgid "[commented] on revision in repository" +msgstr "[kommentiert] revision in Repository" + +#: kallithea/lib/helpers.py:801 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:803 +msgid "[closed] pull request for" +msgstr "[geschlossen] Pull Request für" + +#: kallithea/lib/helpers.py:805 +msgid "[pushed] into" +msgstr "[übermittelt] in" + +#: kallithea/lib/helpers.py:807 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:809 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "[gezogen] von" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr " und %s weitere" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "Keine Dateien" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "neue Datei" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "entf" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "umbenennen" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1157,74 +1233,104 @@ "es im Dateisystem erstellt oder umbenannt. Bitte starten sie die " "Applikation erneut um die Repositories neu zu Indizieren" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "in %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "vor %s" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "in %s und %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "%s und %s her" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "jetzt gerade" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "Kein Zugriff auf Repository" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "Lesender Zugriff auf Repository" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1234,12 +1340,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "Kein Zugriff auf Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "Schreibdender Zugriff auf Repository" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1249,162 +1355,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" -msgstr "Lesender Zugriff auf Repository" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" +msgstr "Administrativer Zugang zum Repository" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" -msgstr "Schreibdender Zugriff auf Repository" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" +msgstr "Repository Gruppe hat Keinen Zugriff" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" -msgstr "Administrativer Zugang zum Repository" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "Repository Gruppe hat lesenden Zugriff" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" +msgstr "Repository Gruppe hat schreibenden Zugriff" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "Repository Gruppe hat Keinen Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" -msgstr "Repository Gruppe hat lesenden Zugriff" +msgid "Repository Group admin access" +msgstr "Repository Gruppe hat Administrativen Zugriff" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" -msgstr "Repository Gruppe hat schreibenden Zugriff" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" +msgstr "Kallithea Administrator" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" -msgstr "Repository Gruppe hat Administrativen Zugriff" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "Repository erstelllung deaktiviert" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" +msgstr "Repository erstellung aktiviert" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "Kallithea Administrator" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "Repository erstelllung deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" -msgstr "Repository erstellung aktiviert" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" +msgstr "Registrierung deaktiviert" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" -msgstr "Registrierung deaktiviert" +msgid "Register new user with Kallithea with manual activation" +msgstr "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "Registrierung neuer Benutzer in Kallithea mit Automatischer Aktivierung" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "Nicht Begutachtet" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "Akzeptiert" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1414,12 +1520,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "Nicht Begutachtet" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "Abgelehnt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1429,52 +1535,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "Akzeptiert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "Abgelehnt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "In Begutachtung" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "höchste Ebene" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1483,8 +1583,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1495,23 +1595,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1519,8 +1606,19 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1530,9 +1628,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" -msgstr "" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" +msgstr "Nutzergruppe Schreibzugriff" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1541,20 +1639,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" -msgstr "Nutzergruppe Schreibzugriff" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" +msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1563,21 +1650,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1585,32 +1672,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "Registrierung deaktiviert" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1618,48 +1716,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "Registrierung deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "in Zeile %s" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "[Mention]" @@ -1685,123 +1761,168 @@ msgid "Name must not contain only digits" msgstr "Name darf nicht nur Ziffern enthalten" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, fuzzy, python-format +msgid "New user %(new_username)s registered" +msgstr "Benutzername \"%(username)s\" ist ungültig" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +#, fuzzy +msgid "Closing" +msgstr "Schließen mit" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 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/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -"Sie können diesen Benutzer nicht löschen, da er von entscheidender Bedeutung " -"für die ganze Applikation ist" - -#: kallithea/model/user.py:276 +"Sie können diesen Benutzer nicht löschen, da er von entscheidender " +"Bedeutung für die ganze Applikation ist" + +#: kallithea/model/user.py:261 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:268 #, 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:304 +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:275 +#, 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:305 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "Dein neues Passwort" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "Dein neues Kallithea-Passwort: %s" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Benutezrname \"%(username)s\" existiert bereits" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "Benutzername \"%(username)s\" ist verboten" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" msgstr "" -"Der Benutzername darf nur alphanumerische Zeichen, Unterstriche, Punkte oder " -"Bindestriche enthalten und muss mit einem alphanumerischen Zeichen oder " -"einem Unterstrich beginnen" - -#: kallithea/model/validators.py:151 +"Der Benutzername darf nur alphanumerische Zeichen, Unterstriche, Punkte " +"oder Bindestriche enthalten und muss mit einem alphanumerischen Zeichen " +"oder einem Unterstrich beginnen" + +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "Die Eingabe ist nicht gültig" -#: kallithea/model/validators.py:158 +#: kallithea/model/validators.py:139 #, python-format msgid "Username %(username)s is not valid" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:158 msgid "Invalid user group name" msgstr "Ungültiger Benutzergruppenname" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Benutzergruppe \"%(usergroup)s\" existiert bereits" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1810,110 +1931,111 @@ "Unterstriche, Punkte oder Bindestriche enthalten und muss mit einem " "alphanumerischen Zeichen beginnen" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "Kann diese Gruppe nicht als vorgesetzt setzen" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Gruppe \"%(group_name)s\" existiert bereits" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, 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:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "Üngültige(nicht ASCII) Zeichen im Passwort" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:291 msgid "Passwords do not match" msgstr "Die Passwörter stimmen nicht überein" -#: kallithea/model/validators.py:327 +#: kallithea/model/validators.py:308 msgid "invalid password" msgstr "Ungültiges Passwort" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:309 msgid "invalid user name" msgstr "Ungültiger Benutzername" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:310 msgid "Your account is disabled" msgstr "Ihr Account wurde Deaktiviert" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Repository Name \"%(repo)s\" ist verboten" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Es gibt bereits ein Repository mit \"%(repo)s\"" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, 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:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" +#: kallithea/model/validators.py:474 +#, fuzzy +msgid "invalid clone URL" msgstr "ungültige Clone Adresse" -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" - -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:475 +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +msgstr "" + +#: kallithea/model/validators.py:500 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:534 +#: kallithea/model/validators.py:515 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:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "Dieser Benutzername oder Benutzergruppenname ist nicht gültig" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "Dies ist ein Ungültiger Pfad" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "Diese EMail Addresse ist schon in Benutzung" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "EMail Addresse \"%(email)s\" existiert nicht." -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1921,34 +2043,34 @@ "Das LDAP Login Attribut des CN muss angeben werden - Es ist der Name des " "Attributes welches das Equivalent zum \"Benutzername\" ist" -#: kallithea/model/validators.py:804 +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "Bitte gib eine gültige IPv4- oder IPv6-Adresse an" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "Über" @@ -1959,35 +2081,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "Schnellfilter..." #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "Repositories" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "Repository hinzufügen" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -2004,164 +2127,165 @@ msgstr "Gruppenname" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "Beschreibung" -#: kallithea/templates/index_base.html:126 +#: kallithea/templates/index_base.html:129 #: kallithea/templates/admin/my_account/my_account_repos.html:46 #: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 #: kallithea/templates/admin/repos/repo_add_base.html:9 #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 #: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks.html:49 #: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 +#: kallithea/templates/branches/branches.html:49 #: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 #: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "Name" -#: kallithea/templates/index_base.html:129 +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "Letzte Änderung" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "Tipp" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "Besitzer" -#: kallithea/templates/index_base.html:141 +#: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "Klicken um Aufsteigend zu Sortieren" -#: kallithea/templates/index_base.html:142 +#: kallithea/templates/index_base.html:145 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 msgid "Click to sort descending" msgstr "Klicken um Absteigend zu Sortieren" -#: kallithea/templates/index_base.html:143 +#: kallithea/templates/index_base.html:146 msgid "No repositories found." msgstr "Keine Repositories gefunden." -#: kallithea/templates/index_base.html:144 +#: kallithea/templates/index_base.html:147 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 msgid "Data error." msgstr "Datenfehler." -#: kallithea/templates/index_base.html:145 +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "Lade..." -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "Benutzername" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "Passwort" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "Login Speichern" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "Einloggen" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "Passowrt Vergessen?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "Kein Account?" @@ -2169,78 +2293,85 @@ msgid "Password Reset" msgstr "Passwort zurücksetzen" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" +#: kallithea/templates/password_reset.html:12 +#, fuzzy, python-format +msgid "Reset Your Password to %s" msgstr "Setze dein Passwort auf %s zurück" -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" +#: kallithea/templates/password_reset.html:14 +#, fuzzy +msgid "Reset Your Password" msgstr "Setze dein Passwort zurück" -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "E-Mailadresse" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "Captcha" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" +#: kallithea/templates/password_reset.html:46 +#, fuzzy +msgid "Send Password Reset Email" +msgstr "Passwort zurücksetzen" + +#: kallithea/templates/password_reset.html:47 +#, fuzzy +msgid "" +"Password reset link will be sent to the email address matching your " +"username." msgstr "Der Passwort Reset LInk wird an die passende EMail Addresse gesendet" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "Registrieren" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "Passwort erneut eingeben" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "Vorname" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "Nachname" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "EMail" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "Ihr Account muss direkt nach der Registrierung aktiviert werden" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" -msgstr "Ihr Account muss durch einen Administrator aktiviert werden" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." +msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "Es gibt bisher keine Branches" @@ -2259,38 +2390,40 @@ msgstr "Es gibt bisher keine Lesezeichen" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +#, fuzzy +msgid "Admin Journal" msgstr "Admin Logbuch" -#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/admin/admin.html:10 msgid "journal filter..." msgstr "Logbuch filter..." -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" -msgstr "" - -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +#, fuzzy +msgid "Filter" +msgstr "Profil" + +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "%s Eintrag" msgstr[1] "%s Einträge" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "Aktion" @@ -2300,11 +2433,11 @@ msgstr "Repository" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Datum" @@ -2321,160 +2454,161 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "Aktivierte Plugins" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "Aktivierte Plugins" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "Aktiviert" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "Deaktiviert" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "Plugin" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "Speichern" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "Plugin" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" +msgstr "Repositories" + +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "Typ" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "Privates Repository" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "Aktiviere Statistiken" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "Aktiviere Downloads" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2482,75 +2616,69 @@ msgid "never" msgstr "nie" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "Abbrechen" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" -msgstr "" +#: kallithea/templates/admin/gists/index.html:16 +#, fuzzy, python-format +msgid "Private Gists for User %s" +msgstr "Nutzer %s erstellt" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2558,118 +2686,114 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "Zurücksetzen" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "Löschen" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Bearbeiten" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "Mein Account" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "Mein Account" -#: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "Profil" +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:38 +msgid "My Emails" +msgstr "Meine E-Mails" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" +msgstr "Meine Repositories" + #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "Meine E-Mails" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "Meine Repositories" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "Pull Request" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +#, fuzzy +msgid "My Permissions" msgstr "Meine Rechte" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2740,7 +2864,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2761,7 +2884,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2770,8 +2893,9 @@ msgstr "Neue E-Mailadresse" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" -msgstr "" +#, fuzzy +msgid "Change Your Account Password" +msgstr "Dein neues Passwort" #: kallithea/templates/admin/my_account/my_account_password.html:7 msgid "Current password" @@ -2786,115 +2910,77 @@ msgid "Confirm new password" msgstr "Bestätige neues Passwort" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/users/user_edit_profile.html:9 +msgid "Using" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:14 #: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "Avatare sind deaktiviert" -#: kallithea/templates/admin/my_account/my_account_profile.html:13 +#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "Aktuelle IP-Adresse" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" -msgstr "" +#, fuzzy +msgid "Repositories You Own" +msgstr "Keine Repositories gefunden." #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "Keine Datensätze gefunden." #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" -msgstr "" +#, fuzzy +msgid "Repositories You are Watching" +msgstr "Repository erstellung" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "Meine Benachrichtigungen" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "Alle" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "Kommentare" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "Pull Requests" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +#, fuzzy +msgid "Mark All Read" msgstr "Markiere alle als gelesen" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2902,38 +2988,40 @@ msgstr "Bisher gibt es keine Benachrichtigungen" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" +#: kallithea/templates/admin/notifications/show_notification.html:11 +#, fuzzy +msgid "Show Notification" msgstr "Zeige Benachrichtigung" -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "Benachrichtigungen" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" +#, fuzzy +msgid "Permissions Administration" msgstr "Rechte Administration" -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "Rechte" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "Global" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "Übersicht" @@ -2944,8 +3032,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2965,7 +3053,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "Repository Gruppe" @@ -2998,8 +3086,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3019,7 +3107,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -3030,7 +3118,7 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +msgid "All IP addresses are allowed." msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -3039,68 +3127,64 @@ msgstr "Neue IP-Adresse" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +#, fuzzy +msgid "Default User Permissions Overview" +msgstr "Standart Rechte" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "Gruppen name" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +#, fuzzy, python-format +msgid "%s Repository Group Settings" +msgstr "Repositoriumsgruppe %s aktualisiert" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "Einstellungen" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "Erweitert" @@ -3124,7 +3208,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "" @@ -3223,60 +3307,63 @@ " groups and repositories inside" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Remove this group" +msgstr "Diese Benutzergruppe löschen" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "mit" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" -msgstr "Neues Repository" +#, fuzzy +msgid "Repository Groups Administration" +msgstr "Benutzergruppenverwaltung" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +msgid "Number of Top-level Repositories" +msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:14 msgid "Import existing repository ?" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "Clone von" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +#, fuzzy +msgid "Optional URL from which repository should be cloned." msgstr "Optionale http[s] URL von diesem das Repository geclont werden soll." #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." -msgstr "" -"Wähle optional eine Gruppe in welcher das Repository platziert werden " -"soll." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." +msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:63 msgid "Type of repository to create." @@ -3284,7 +3371,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "Start Revision" @@ -3295,165 +3382,174 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +#, fuzzy, python-format +msgid "%s Creating Repository" +msgstr "Fehler beim Erstellen des Repositoriums %s" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "Repository erstellung" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "Entfernt" -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "Statistiken" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#, fuzzy +msgid "Public Journal Visibility" msgstr "Sichtbarkeit des Öffentlichen Logbuches" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "Entferne aus dem Öffentlichen Logbuch" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +#, fuzzy +msgid "Add to Public Journal" msgstr "Zum Öffentlichen Logbuch hinzufügen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 +#, fuzzy msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" +"All actions done in this repository will be visible to everyone in the " +"public journal." msgstr "" "Alle Aktionen die in diesem Repository durchgeführt wurden sind für jeden" " Zugänglich im Öffentlichen Logbuch" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +#, fuzzy +msgid "Confirm to unlock repository." +msgstr "Entsperrtes Repositorium" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "Entsperrtes Repositorium" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." +msgstr "Entsperrtes Repositorium" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "Entsperrtes Repositorium" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" msgstr "Dieses Repository löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" -msgstr "" +#, fuzzy +msgid "Invalidate Repository Cache" +msgstr "privates Repository" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +msgid "Confirm to invalidate repository cache." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3466,12 +3562,12 @@ msgstr "Schlüssel" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "Aktiv" @@ -3505,27 +3601,30 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" -msgstr "" +#, fuzzy +msgid "Extra fields are disabled." +msgstr "Avatare sind deaktiviert" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "private repository" msgstr "privates Repository" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" -msgstr "" +#, fuzzy +msgid "Remote URL" +msgstr "Entfernt" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" -msgstr "" +#, fuzzy +msgid "Pull Changes from Remote Location" +msgstr "Von entferntem Ort übertragen" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +msgid "Confirm to pull changes from remote side." msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3533,7 +3632,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3543,16 +3642,18 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" -msgstr "" +#: kallithea/templates/summary/summary.html:72 +#, fuzzy +msgid "Clone URL" +msgstr "ungültige Clone Adresse" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 #: kallithea/templates/base/perms_summary.html:43 @@ -3572,15 +3673,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." +msgid "URL used for doing remote pulls." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" @@ -3597,47 +3693,51 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" +#, fuzzy +msgid "Reset Statistics" msgstr "Statistiken zurücksetzen" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +msgid "Confirm to remove current statistics." msgstr "" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" -msgstr "" - -#: kallithea/templates/admin/repos/repos.html:54 +#, fuzzy +msgid "Repositories Administration" +msgstr "Benutzerverwaltung" + +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:40 +#, fuzzy +msgid "Settings Administration" +msgstr "Benutzerverwaltung" + +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "Hooks" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" +#: kallithea/templates/admin/settings/settings.html:33 +#, fuzzy +msgid "Full Text Search" msgstr "Volltextsuche" -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "Systeminfo" @@ -3706,35 +3806,42 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" msgstr "Einstellungen speichern" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3744,10 +3851,10 @@ msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:69 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "" @@ -3761,9 +3868,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3771,19 +3877,17 @@ msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." +msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3800,7 +3904,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3825,11 +3929,12 @@ msgstr "Plattform" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" -msgstr "" +#, fuzzy +msgid "Git version" +msgstr "Python-Version" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3837,16 +3942,16 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" -msgstr "" -"Hinweis: Bitte stelle sicher, dass der Server auf die URL zugreifen kann" +#, fuzzy +msgid "Note: please make sure this server can access this URL" +msgstr "Hinweis: Bitte stelle sicher, dass der Server auf die URL zugreifen kann" #: kallithea/templates/admin/settings/settings_system.html:14 msgid "Checking for updates..." msgstr "Prüfe auf Updates..." #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3859,8 +3964,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3880,7 +3985,8 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +#, fuzzy +msgid "Mercurial extensions" msgstr "Mercurial-Erweiterungen" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3893,13 +3999,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "" +#, fuzzy +msgid "Location of repositories" +msgstr "Repositories" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" @@ -3909,8 +4016,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3939,8 +4046,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3956,8 +4063,10 @@ #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -3970,71 +4079,72 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "Icons" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Benutzergruppe hinzufügen" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" msgstr "Benutzergruppen" -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "Benutzergruppe hinzufügen" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "Kurze, optionale Beschreibung für diese Benutzergruppe." @@ -4044,19 +4154,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "Benutzergruppen" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "Standart Rechte" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "Mitglieder" @@ -4075,7 +4180,7 @@ msgid "Delete this user group" msgstr "Diese Benutzergruppe löschen" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "Noch keine Mitglieder" @@ -4083,23 +4188,16 @@ msgid "Chosen group members" msgstr "Ausgewählte Grppenmitglieder" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "Verfügbare Mitglieder" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" +#, fuzzy +msgid "User Groups Administration" msgstr "Benutzergruppenverwaltung" -#: kallithea/templates/admin/user_groups/user_groups.html:13 +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "Benutzergruppen" @@ -4107,18 +4205,19 @@ msgid "Add user" msgstr "Benutzer hinzufügen" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "Benutzer" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "Benutzer hinzufügen" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "" @@ -4127,14 +4226,15 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +msgid "Default Permissions" +msgstr "Standart Rechte" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4146,6 +4246,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "Letzter Login" @@ -4192,193 +4293,189 @@ msgstr "" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" +#, fuzzy +msgid "Users Administration" msgstr "Benutzerverwaltung" -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "Benutzer" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "Vorname" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" -msgstr "Nachname" - #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "Letzter Login" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" +#, fuzzy +msgid "Auth Type" msgstr "Authentifizierungsart" -#: kallithea/templates/base/base.html:37 +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "Support" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +#, fuzzy +msgid "Create Fork" +msgstr "[erstellt] Benutzer" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Zusammenfassung" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Dateien" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 msgid "Options" msgstr "Optionen" -#: kallithea/templates/base/base.html:166 +#: kallithea/templates/base/base.html:158 #: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +#, fuzzy +msgid "Compare Fork" +msgstr "vergleichsansicht" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:13 +#: kallithea/templates/branches/branches.html:56 +#: kallithea/templates/branches/branches_data.html:13 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:13 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 +msgid "Search" +msgstr "" + +#: kallithea/templates/base/base.html:166 +msgid "Unlock" msgstr "" #: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "" - -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 -msgid "Search" -msgstr "" - -#: kallithea/templates/base/base.html:174 -msgid "Unlock" +msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "" - -#: kallithea/templates/base/base.html:263 +#: kallithea/templates/base/base.html:224 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:225 +#: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 +msgid "Journal" +msgstr "Logbuch" + +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 +msgid "Public journal" +msgstr "Öffentliches Logbuch" + +#: kallithea/templates/base/base.html:236 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:237 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:241 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:243 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:244 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:249 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#, fuzzy +msgid "My Pull Requests" +msgstr "Pull Request" + +#: kallithea/templates/base/base.html:292 +#, fuzzy +msgid "Not Logged In" +msgstr "Letzter Login" + +#: kallithea/templates/base/base.html:299 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:322 msgid "Forgot password ?" msgstr "Passwort vergessen?" -#: kallithea/templates/base/base.html:286 +#: kallithea/templates/base/base.html:347 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:311 -msgid "Show recent activity" -msgstr "" - -#: kallithea/templates/base/base.html:312 -#: kallithea/templates/journal/journal.html:4 -msgid "Journal" -msgstr "Logbuch" - -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 -msgid "Public journal" -msgstr "Öffentliches Logbuch" - -#: kallithea/templates/base/base.html:323 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:324 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 -msgid "Search in repositories" -msgstr "" - -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "Keine Übereinstimmungen gefunden" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4439,112 +4536,118 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" +msgstr "%d Kommentar" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "Gruppe" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "mitglieder" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" -msgstr "" - -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" -msgstr "" - -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +#, fuzzy +msgid "Open New Pull Request" +msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" + +#: kallithea/templates/base/root.html:32 +msgid "Open New Pull Request for Selected Changesets" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +#, fuzzy +msgid "Show Selected Changeset __S" +msgstr "Änderungssätze auswählen" + +#: kallithea/templates/base/root.html:35 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" -msgstr "" +#: kallithea/templates/base/root.html:39 +#, fuzzy +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" + +#: kallithea/templates/base/root.html:43 +#, fuzzy +msgid "Specify changeset" +msgstr "Änderungssätze auswählen" #: kallithea/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "Autor" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "Revision" @@ -4554,7 +4657,7 @@ msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4570,322 +4673,360 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "Git Repository" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "Branch %s" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "Bisher gibt es keine Änderungen" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" -msgstr "Alter" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" +msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "Alter" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d Kommentar" -msgstr[1] "%d Kommentare" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "Statusänderung -> %s" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +#, fuzzy +msgid "No title" +msgstr "neue Datei" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +#, fuzzy +msgid "Comment from pull request" +msgstr "[geschlossen] Pull Request für" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 -msgid "Commenting on line {1}." -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" +msgstr "%d Kommentar" #: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +msgid "Commenting on line {1}." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" -msgstr "Vorschau" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +msgid "Use @username inside this text to notify another user" +msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "Kommentarvorschau" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +msgid "Submitting ..." +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "Kommentar" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "Vorschau" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d Kommentar" +msgstr[1] "%d Kommentare" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, fuzzy, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "Allgemein" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +msgid "Use @username inside this text to send notification to another local user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" +msgstr "Änderungssätze auswählen" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "Keine Änderungen" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(geschlossen)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4893,13 +5034,15 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" -msgstr "" +#: kallithea/templates/changeset/diff_block.html:87 +#, fuzzy +msgid "Deleted" +msgstr "löschen" + +#: kallithea/templates/changeset/diff_block.html:90 +#, fuzzy +msgid "Renamed" +msgstr "umbenennen" #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -4909,30 +5052,54 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "Änderungssätze" + +#: kallithea/templates/compare/compare_cs.html:85 +#, fuzzy +msgid "behind" +msgstr "Erneut Indizieren" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4940,38 +5107,43 @@ msgstr[1] "" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "Mercurial Repository" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "Git Repository" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "Öffenentliches Repository" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "Abonniere den %s RSS Feed" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "Abonniere den %s ATOM Feed" @@ -4980,17 +5152,22 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 @@ -4998,82 +5175,66 @@ msgid "Hello %s" msgstr "Hallo %s" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "" -"Wir haben eine Anforderung erhalten, für deinen Account ein neues Passwort " -"zu erstellen." - -#: kallithea/templates/email_templates/password_reset.html:6 +"Wir haben eine Anforderung erhalten, für deinen Account ein neues " +"Passwort zu erstellen." + +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "Du kannst es über die folgende URL erstellen" #: kallithea/templates/email_templates/password_reset.html:10 msgid "Please ignore this email if you did not request a new password ." msgstr "" -"Bitte ignoriere diese E-Mail, wenn du kein neues Passwort angefordert hast." - -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "Titel" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +"Bitte ignoriere diese E-Mail, wenn du kein neues Passwort angefordert " +"hast." + +#: kallithea/templates/email_templates/pull_request.html:5 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "" @@ -5083,85 +5244,83 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "oder" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" -msgstr "" - -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" +msgstr "Keine Änderungen" + +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 +#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:29 +#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "Größe" -#: kallithea/templates/files/files_browser.html:43 +#: kallithea/templates/files/files_browser.html:62 msgid "Mimetype" msgstr "MIME-Type" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" +#: kallithea/templates/files/files_browser.html:64 +#, fuzzy +msgid "Last Modified" msgstr "Zuletzt geändert" -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:65 +msgid "Last Committer" msgstr "" #: kallithea/templates/files/files_delete.html:4 @@ -5169,8 +5328,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "Datei löschen" @@ -5179,32 +5338,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5249,12 +5404,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "Die Datei ist zu groß, um sie anzuzeigen" @@ -5275,9 +5430,9 @@ msgid "%s Followers" msgstr "" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "" @@ -5290,31 +5445,35 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "Privat" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "Berechtigungen kopieren" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5323,9 +5482,9 @@ msgid "%s Forks" msgstr "" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "" @@ -5333,164 +5492,292 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "ATOM Logbuch Feed" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "RSS Logbuch Feed" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" -msgstr "" - -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" +msgstr "Leeres Repository" + +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Öffentliches Logbuch" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "ATOM Feed für das Öffentliche Logbuch" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "RSS Feed für das Öffentliche Logbuch" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:44 +#, fuzzy +msgid "New Pull Request" +msgstr "Pull Request" + +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "Titel" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +#, fuzzy +msgid "Pull Request Reviewers" +msgstr "Pull Request" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, fuzzy, python-format +msgid "Latest vote: %s" +msgstr "Tag %s erstellt" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +#, fuzzy +msgid "Delete Pull Request" +msgstr "Erfolgreich Pull-Request gelöscht" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, fuzzy, python-format +msgid "Pull request #%s from %s#%s" +msgstr "Pull Request" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#, fuzzy +msgid "Summarize the changes" +msgstr "Letzte Änderungen" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "Es gibt bisher keine Branches" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#, fuzzy +msgid "on" +msgstr "keine" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +#, fuzzy +msgid "Created by" +msgstr "[erstellt] Benutzer" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +msgid "Update" +msgstr "[akutalisiert] Benutzer" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "Kommentarvorschau" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" -msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +#, fuzzy +msgid "Save as New Pull Request" +msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "Letzte Änderungen" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +#, fuzzy +msgid "Pull Request Content" +msgstr "Pull Request" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, fuzzy, python-format +msgid "Pull Requests from %s'" +msgstr "Pull Request" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, fuzzy, python-format +msgid "Pull Requests to '%s'" +msgstr "Pull Request" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, fuzzy, python-format +msgid "Show Pull Requests to %s" +msgstr "[geschlossen] Pull Request für" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, fuzzy, python-format +msgid "Show Pull Requests from '%s'" +msgstr "[geschlossen] Pull Request für" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#, fuzzy +msgid "Pull Requests Created by Me" +msgstr "Pull Request" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 @@ -5499,27 +5786,28 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" -msgstr "" - -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:16 +#, fuzzy +msgid "Search in All Repositories" +msgstr "Mercurial Repository" + +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "" +#: kallithea/templates/search/search.html:62 +msgid "Search in" +msgstr "" + #: kallithea/templates/search/search.html:65 -msgid "Search in" -msgstr "" - -#: kallithea/templates/search/search.html:68 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "" @@ -5534,67 +5822,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:389 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:390 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "" + #: kallithea/templates/summary/statistics.html:392 -msgid "commits" -msgstr "" - -#: kallithea/templates/summary/statistics.html:393 -msgid "files added" +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" +msgid "commit" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "" @@ -5603,78 +5891,80 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:111 +msgid "Download" +msgstr "" + #: kallithea/templates/summary/summary.html:115 -msgid "Download" -msgstr "" - -#: kallithea/templates/summary/summary.html:119 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" msgstr "Letzte Änderungen" -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" -msgstr "" - -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:191 +#, fuzzy +msgid "Quick Start" +msgstr "Schnellfilter..." + +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "" @@ -5684,6 +5974,8 @@ msgid "%s Tags" msgstr "%s Tags" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" -msgstr "" +#: kallithea/templates/tags/tags.html:26 +#, fuzzy +msgid "Compare Tags" +msgstr "vergleichsansicht" +
--- a/kallithea/i18n/en/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/en/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -15,77 +15,81 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 #, fuzzy msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:72 -msgid "Home page" +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:99 +msgid "Unauthorized access to resource" msgstr "" #: kallithea/controllers/error.py:101 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:104 -msgid "Unauthorized access to resource" -msgstr "" - -#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -102,12 +106,12 @@ msgstr "" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "" @@ -125,213 +129,286 @@ msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, python-format +msgid "%s at %s" +msgstr "" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:461 -msgid "No content" -msgstr "" - #: kallithea/controllers/files.py:465 +msgid "No content" +msgstr "" + +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:535 -#, python-format -msgid "Unknown revision %s" -msgstr "" - -#: kallithea/controllers/files.py:537 -msgid "Empty repository" -msgstr "" - #: kallithea/controllers/files.py:539 +#, python-format +msgid "Unknown revision %s" +msgstr "" + +#: kallithea/controllers/files.py:541 +msgid "Empty repository" +msgstr "" + +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "" -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" +#: kallithea/controllers/pullrequests.py:130 +#, python-format +msgid "%s (closed)" msgstr "" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +msgid "Pull request update created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:503 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "" - -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +msgid "Closing." msgstr "" #: kallithea/controllers/search.py:135 @@ -343,23 +420,24 @@ msgstr "" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" -msgstr "" - -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" -msgstr "" - -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +msgid "An error occurred during search operation." +msgstr "" + +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +msgid "No data ready yet" +msgstr "" + +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" @@ -367,72 +445,72 @@ msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" +#, fuzzy +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 #, fuzzy -msgid "5 minutes" +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 #, fuzzy -msgid "1 hour" +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 #, fuzzy -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 -#, fuzzy msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -441,62 +519,55 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -512,28 +583,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "" @@ -555,26 +626,26 @@ msgstr "" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "" @@ -590,21 +661,21 @@ msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "" @@ -634,182 +705,182 @@ msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 -msgid "Updated repository visibility in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:526 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:618 -msgid "Cache invalidation successful" -msgstr "" - #: kallithea/controllers/admin/repos.py:622 +msgid "Cache invalidation successful" +msgstr "" + +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" #: kallithea/controllers/admin/settings.py:270 @@ -828,23 +899,23 @@ msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:414 -msgid "Updated hooks" -msgstr "" - #: kallithea/controllers/admin/settings.py:418 +msgid "Updated hooks" +msgstr "" + +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "" @@ -853,106 +924,114 @@ msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" @@ -965,163 +1044,158 @@ msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "" -#: kallithea/lib/helpers.py:743 -msgid "[deleted] repository" -msgstr "" - -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 -msgid "[created] repository" -msgstr "" - -#: kallithea/lib/helpers.py:747 -msgid "[created] repository as fork" -msgstr "" - -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 -msgid "[forked] repository" -msgstr "" - -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 -msgid "[updated] repository" -msgstr "" - -#: kallithea/lib/helpers.py:753 -msgid "[downloaded] archive from repository" -msgstr "" - -#: kallithea/lib/helpers.py:755 -msgid "[delete] repository" -msgstr "" - -#: kallithea/lib/helpers.py:763 -msgid "[created] user" -msgstr "" - -#: kallithea/lib/helpers.py:765 -msgid "[updated] user" -msgstr "" - -#: kallithea/lib/helpers.py:767 -msgid "[created] user group" -msgstr "" - -#: kallithea/lib/helpers.py:769 -msgid "[updated] user group" -msgstr "" - #: kallithea/lib/helpers.py:771 -msgid "[commented] on revision in repository" -msgstr "" - -#: kallithea/lib/helpers.py:773 -msgid "[commented] on pull request for" +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 +msgid "[created] repository" msgstr "" #: kallithea/lib/helpers.py:775 -msgid "[closed] pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:777 -msgid "[pushed] into" -msgstr "" - -#: kallithea/lib/helpers.py:779 -msgid "[committed via Kallithea] into repository" +msgid "[created] repository as fork" +msgstr "" + +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 +msgid "[forked] repository" +msgstr "" + +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 +msgid "[updated] repository" msgstr "" #: kallithea/lib/helpers.py:781 -msgid "[pulled from remote] into repository" +msgid "[downloaded] archive from repository" msgstr "" #: kallithea/lib/helpers.py:783 +msgid "[delete] repository" +msgstr "" + +#: kallithea/lib/helpers.py:791 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:793 +msgid "[updated] user" +msgstr "" + +#: kallithea/lib/helpers.py:795 +msgid "[created] user group" +msgstr "" + +#: kallithea/lib/helpers.py:797 +msgid "[updated] user group" +msgstr "" + +#: kallithea/lib/helpers.py:799 +msgid "[commented] on revision in repository" +msgstr "" + +#: kallithea/lib/helpers.py:801 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:803 +msgid "[closed] pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:805 +msgid "[pushed] into" +msgstr "" + +#: kallithea/lib/helpers.py:807 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:809 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1129,74 +1203,104 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1206,12 +1310,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1221,162 +1325,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" +msgid "Repository Group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" +msgid "Register new user with Kallithea with manual activation" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1386,12 +1490,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1401,52 +1505,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1455,8 +1553,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1467,23 +1565,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1491,8 +1576,19 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1502,8 +1598,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1513,19 +1609,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1535,21 +1620,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1557,32 +1642,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1590,48 +1686,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "" @@ -1657,254 +1731,298 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +msgid "Closing" +msgstr "" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:276 +#: kallithea/model/user.py:261 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:268 +#, 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:275 #, 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:304 +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:151 +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:139 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:158 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:177 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" +#: kallithea/model/validators.py:291 +msgid "Passwords do not match" +msgstr "" + +#: kallithea/model/validators.py:308 +msgid "invalid password" +msgstr "" + +#: kallithea/model/validators.py:309 +msgid "invalid user name" +msgstr "" + #: kallithea/model/validators.py:310 -msgid "Passwords do not match" -msgstr "" - -#: kallithea/model/validators.py:327 -msgid "invalid password" -msgstr "" - -#: kallithea/model/validators.py:328 -msgid "invalid user name" -msgstr "" - -#: kallithea/model/validators.py:329 msgid "Your account is disabled" msgstr "" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" -msgstr "" - -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" - -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:474 +msgid "invalid clone URL" +msgstr "" + +#: kallithea/model/validators.py:475 +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +msgstr "" + +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 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:804 +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1915,35 +2033,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "" #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -1960,164 +2079,165 @@ msgstr "" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:126 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - #: kallithea/templates/index_base.html:129 +#: kallithea/templates/admin/my_account/my_account_repos.html:46 +#: kallithea/templates/admin/my_account/my_account_watched.html:46 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 +#: kallithea/templates/admin/repos/repo_add_base.html:9 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 +#: kallithea/templates/base/perms_summary.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:49 +#: kallithea/templates/bookmarks/bookmarks_data.html:7 +#: kallithea/templates/branches/branches.html:49 +#: kallithea/templates/branches/branches_data.html:7 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 +#: kallithea/templates/tags/tags_data.html:7 +msgid "Name" +msgstr "" + +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:143 -msgid "No repositories found." -msgstr "" - #: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 -msgid "Data error." +#: kallithea/templates/admin/my_account/my_account_repos.html:57 +#: kallithea/templates/admin/my_account/my_account_watched.html:57 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 +msgid "Click to sort ascending" msgstr "" #: kallithea/templates/index_base.html:145 +#: kallithea/templates/admin/my_account/my_account_repos.html:58 +#: kallithea/templates/admin/my_account/my_account_watched.html:58 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/index_base.html:146 +msgid "No repositories found." +msgstr "" + +#: kallithea/templates/index_base.html:147 +#: kallithea/templates/admin/my_account/my_account_repos.html:60 +#: kallithea/templates/admin/my_account/my_account_watched.html:60 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 +msgid "Data error." +msgstr "" + +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "" -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "" @@ -2125,78 +2245,82 @@ msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, python-format +msgid "Reset Your Password to %s" +msgstr "" + +#: kallithea/templates/password_reset.html:14 +msgid "Reset Your Password" +msgstr "" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" -msgstr "" - -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/password_reset.html:46 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +msgid "" +"Password reset link will be sent to the email address matching your " +"username." +msgstr "" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "" @@ -2215,38 +2339,38 @@ msgstr "" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +msgid "Admin Journal" +msgstr "" + +#: kallithea/templates/admin/admin.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -msgid "journal filter..." -msgstr "" - -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" -msgstr "" - -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "" msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "" @@ -2256,11 +2380,11 @@ msgstr "" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2277,160 +2401,160 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:25 +msgid "Repository Defaults" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2438,75 +2562,69 @@ msgid "never" msgstr "" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2514,119 +2632,114 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 #, fuzzy msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +msgid "My Permissions" msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2697,7 +2810,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2718,7 +2830,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2727,7 +2839,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" +msgid "Change Your Account Password" msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:7 @@ -2743,116 +2855,75 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:11 -msgid "Avatars are disabled" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:13 -msgid "Missing email, please update your user email address." +#: kallithea/templates/admin/users/user_edit_profile.html:9 +msgid "Using" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/users/user_edit_profile.html:11 +msgid "Avatars are disabled" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:15 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" +msgid "Repositories You Own" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" +msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 #, fuzzy msgid "Comments" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +msgid "Mark All Read" msgstr "" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2860,38 +2931,38 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:11 +msgid "Show Notification" +msgstr "" + +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +msgid "Permissions Administration" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "" @@ -2902,8 +2973,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2923,7 +2994,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "" @@ -2956,8 +3027,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2977,7 +3048,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -2988,7 +3059,7 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +msgid "All IP addresses are allowed." msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -2997,68 +3068,63 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +msgid "Default User Permissions Overview" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 #, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +msgid "%s Repository Group Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "" @@ -3082,7 +3148,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "" @@ -3182,33 +3248,34 @@ " groups and repositories inside" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, fuzzy, python-format msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" +msgid "Repository Groups Administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +msgid "Number of Top-level Repositories" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:14 @@ -3216,23 +3283,24 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +msgid "Optional URL from which repository should be cloned." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3241,7 +3309,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "" @@ -3253,21 +3321,21 @@ #: kallithea/templates/admin/repos/repo_creating.html:9 #, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +msgid "%s Creating Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." @@ -3275,141 +3343,141 @@ #: kallithea/templates/admin/repos/repo_edit.html:8 #, fuzzy, python-format -msgid "%s repository settings" +msgid "%s Repository Settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" +msgid "Remote" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:58 -msgid "Remote" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +msgid "Public Journal Visibility" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +msgid "Add to Public Journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +msgid "Unlock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +msgid "Lock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 #, fuzzy -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +msgid "Delete this Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +msgid "Invalidate Repository Cache" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +msgid "Confirm to invalidate repository cache." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3422,12 +3490,12 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "" @@ -3461,7 +3529,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" +msgid "Extra fields are disabled." msgstr "" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 @@ -3469,19 +3537,19 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" +msgid "Remote URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +msgid "Pull Changes from Remote Location" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +msgid "Confirm to pull changes from remote side." msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3489,7 +3557,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3499,15 +3567,16 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" +#: kallithea/templates/summary/summary.html:72 +msgid "Clone URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 @@ -3528,15 +3597,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." +msgid "URL used for doing remote pulls." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" @@ -3553,47 +3617,47 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" +msgid "Reset Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +msgid "Confirm to remove current statistics." msgstr "" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" -msgstr "" - -#: kallithea/templates/admin/repos/repos.html:54 +msgid "Repositories Administration" +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:40 +msgid "Settings Administration" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3663,35 +3727,41 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +msgid "Save Settings" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3701,10 +3771,10 @@ msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:69 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "" @@ -3718,9 +3788,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3728,19 +3797,17 @@ msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." +msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3757,7 +3824,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3782,11 +3849,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" +msgid "Git version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3794,7 +3861,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3802,7 +3869,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3815,8 +3882,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3836,7 +3903,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +msgid "Mercurial extensions" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3849,12 +3916,12 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" +msgid "Location of repositories" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:69 @@ -3865,8 +3932,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3895,8 +3962,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3912,8 +3979,10 @@ #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -3926,71 +3995,72 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -4000,19 +4070,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "" @@ -4031,7 +4096,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "" @@ -4039,23 +4104,15 @@ msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_groups.html:13 +msgid "User Groups Administration" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4063,18 +4120,19 @@ msgid "Add user" msgstr "" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "" @@ -4083,14 +4141,14 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "Default Permissions" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4102,6 +4160,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4148,193 +4207,183 @@ msgstr "" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" -msgstr "" - -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" +msgid "Users Administration" msgstr "" #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 +msgid "Options" +msgstr "" + #: kallithea/templates/base/base.html:158 -msgid "Options" +#: kallithea/templates/forks/forks_data.html:21 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:13 +#: kallithea/templates/branches/branches.html:56 +#: kallithea/templates/branches/branches_data.html:13 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:13 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 +msgid "Search" msgstr "" #: kallithea/templates/base/base.html:166 -#: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +msgid "Unlock" msgstr "" #: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "" - -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 -msgid "Search" -msgstr "" - -#: kallithea/templates/base/base.html:174 -msgid "Unlock" +msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:241 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:243 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:244 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:292 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:299 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4395,86 +4444,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 +#: kallithea/templates/base/root.html:22 #, fuzzy -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" -msgstr "" - -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" -msgstr "" - -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Open New Pull Request for Selected Changesets" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +msgid "Show Selected Changeset __S" +msgstr "" + +#: kallithea/templates/base/root.html:35 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" +#: kallithea/templates/base/root.html:39 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:43 +msgid "Specify changeset" msgstr "" #: kallithea/templates/bookmarks/bookmarks.html:5 @@ -4482,26 +4529,29 @@ msgid "%s Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "" @@ -4511,7 +4561,7 @@ msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4527,305 +4577,336 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +msgid "Go to tip of repository" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 #, fuzzy msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +msgid "Status change from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +msgid "No title" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +msgid "Comment from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 -msgid "Commenting on line {1}." +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +msgid "Commenting on line {1}." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -#, fuzzy -msgid "Preview" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +msgid "Use @username inside this text to notify another user" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +msgid "Submitting ..." +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +#, fuzzy +msgid "Preview" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +msgid "Use @username inside this text to send notification to another local user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +msgid "Close" msgstr "" #: kallithea/templates/changeset/changeset_range.html:5 @@ -4833,18 +4914,18 @@ msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4852,12 +4933,12 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" +#: kallithea/templates/changeset/diff_block.html:87 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:90 +msgid "Renamed" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 @@ -4868,30 +4949,53 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:85 +msgid "behind" +msgstr "" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, fuzzy, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4899,38 +5003,43 @@ msgstr[1] "" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "" @@ -4939,17 +5048,22 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 @@ -4957,11 +5071,11 @@ msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "" @@ -4969,67 +5083,50 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +#: kallithea/templates/email_templates/pull_request.html:5 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, fuzzy, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, fuzzy, python-format msgid "%s Files" msgstr "" @@ -5039,85 +5136,81 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" -msgstr "" - -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +msgid "Commit Changes" +msgstr "" + +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 -msgid "Search File List" -msgstr "" - -#: kallithea/templates/files/files_browser.html:29 -msgid "Loading file list..." -msgstr "" - -#: kallithea/templates/files/files_browser.html:42 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:43 -msgid "Mimetype" -msgstr "" - #: kallithea/templates/files/files_browser.html:44 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:48 +msgid "Loading file list..." +msgstr "" + +#: kallithea/templates/files/files_browser.html:61 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:62 +msgid "Mimetype" +msgstr "" + +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" -msgstr "" - -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:64 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +msgid "Last Committer" msgstr "" #: kallithea/templates/files/files_delete.html:4 @@ -5125,8 +5218,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5135,32 +5228,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, fuzzy, python-format msgid "%s author" @@ -5207,12 +5296,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "" @@ -5233,9 +5322,9 @@ msgid "%s Followers" msgstr "" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "" @@ -5248,31 +5337,35 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 #, fuzzy msgid "Fork this Repository" msgstr "" @@ -5282,9 +5375,9 @@ msgid "%s Forks" msgstr "" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "" @@ -5292,133 +5385,238 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" -msgstr "" - -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal.html:56 +msgid "My Repos" +msgstr "" + +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:44 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +msgid "Pull Request Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, python-format +msgid "Latest vote: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request #%s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +msgid "Summarize the changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +msgid "There are no reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +msgid "on" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +msgid "Created by" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "Update" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 #, fuzzy msgid "reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 #, fuzzy msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +msgid "Save as New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 @@ -5426,32 +5624,42 @@ msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 @@ -5460,27 +5668,27 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" -msgstr "" - -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:16 +msgid "Search in All Repositories" +msgstr "" + +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "" +#: kallithea/templates/search/search.html:62 +msgid "Search in" +msgstr "" + #: kallithea/templates/search/search.html:65 -msgid "Search in" -msgstr "" - -#: kallithea/templates/search/search.html:68 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "" @@ -5495,67 +5703,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:389 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:390 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "" + #: kallithea/templates/summary/statistics.html:392 -msgid "commits" -msgstr "" - -#: kallithea/templates/summary/statistics.html:393 -msgid "files added" +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" +msgid "commit" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "" @@ -5564,78 +5772,78 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:111 +msgid "Download" +msgstr "" + #: kallithea/templates/summary/summary.html:115 -msgid "Download" -msgstr "" - -#: kallithea/templates/summary/summary.html:119 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" -msgstr "" - -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" -msgstr "" - -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:189 +msgid "Latest Changes" +msgstr "" + +#: kallithea/templates/summary/summary.html:191 +msgid "Quick Start" +msgstr "" + +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "" @@ -5645,7 +5853,7 @@ msgid "%s Tags" msgstr "" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" -msgstr "" - +#: kallithea/templates/tags/tags.html:26 +msgid "Compare Tags" +msgstr "" +
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -7,88 +7,92 @@ msgstr "" "Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2015-03-08 23:31+0200\n" "Last-Translator: Tuux <tuxa@galaxie.eu.org>\n" "Language-Team: French " "<https://hosted.weblate.org/projects/kallithea/kallithea/fr/>\n" "Language: fr\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.3-dev\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "Toutes les branches" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Aucun" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(fermé)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "Afficher les espaces et tabulations" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorer les espaces et tabulations" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "augmenter le contexte du diff à %(num)s lignes" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "Une telle révision n'existe pas pour ce dépôt" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "Changement de statut -> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "%d commentaire" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "Sélectionner le changeset" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "Accueil" +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 +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:99 +msgid "Unauthorized access to resource" +msgstr "Accès interdit à cet ressource" #: kallithea/controllers/error.py:101 -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:104 -msgid "Unauthorized access to resource" -msgstr "Accès interdit à cet ressource" - -#: kallithea/controllers/error.py:106 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:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "Ressource introuvable" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -107,12 +111,12 @@ msgstr "Flux %s de %s" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "Cet ensemble de changements était trop important et a été découpé…" @@ -130,220 +134,298 @@ msgid "There are no files yet. %s" msgstr "Il n'y a actuellement pas de fichiers. %s" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, fuzzy, python-format +msgid "%s at %s" +msgstr "dans %s et %s" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, 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:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -"Vous pouvez supprimer uniquement les fichiers avec révision étant dans une " -"branche valide " - -#: kallithea/controllers/files.py:324 +"Vous pouvez supprimer uniquement les fichiers avec révision étant dans " +"une branche valide " + +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Le fichier %s a été supprimé via Kallithea" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "Suppression du fichier %s effectuée avec succès" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "%s édité via Kallithea" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "Aucun changement" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "%s ajouté par Kallithea" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "Aucun contenu" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "Aucun nom de fichier" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 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:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "Dépôt vide" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "Type d’archive inconnu" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "Groupes" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Dépôts" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "Étiquette" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "Signet" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "Journal public" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "Journal" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "mauvais captcha" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "Vous vous êtes inscrits avec succès à Kallithea" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "" -"Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a été " -"envoyé par e-mail" - -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "Changements" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" -msgstr "Spécial" +"Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " +"été envoyé par e-mail" + +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(fermé)" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "Changements" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "Spécial" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Branches appairées" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Signets" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "Erreur de création de la demande de pull : %s" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +#, fuzzy +msgid "No description" +msgstr "Description" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +#, fuzzy +msgid "Error occurred while creating pull request" msgstr "Une erreur est survenue durant l’envoi de la requête de pull" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +#, fuzzy +msgid "Pull request update created" +msgstr "Relecteurs de la requête de pull" + +#: kallithea/controllers/pullrequests.py:503 +#, fuzzy +msgid "Pull request updated" +msgstr "Requêtes de pull" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "Fermeture avec" - -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +#, fuzzy +msgid "Closing." +msgstr "en utilisant l’adresse" #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -352,27 +434,30 @@ #: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -"L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de code " -"Whoosh" +"L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " +"code Whoosh" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" +#, fuzzy +msgid "An error occurred during search operation." msgstr "Une erreur est survenue durant l’opération de recherche" -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +#, fuzzy +msgid "No data ready yet" msgstr "Aucune donnée actuellement disponible" -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 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:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "Mise à jour des paramètres d'authentification effectuée avec succès" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" "une erreur est survenue pendant la mise à jour des réglages " @@ -382,68 +467,68 @@ msgid "Default settings updated successfully" msgstr "Mise à jour des réglages par défaut effectuée avec succès" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "Une erreur est survenue durant la mise à jour des réglages par défaut" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "pour toujours" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" -msgstr "pour toujours" +msgid "5 minutes" +msgstr "5 minute" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" -msgstr "5 minute" +msgid "1 hour" +msgstr "1 heure" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" -msgstr "1 heure" +msgid "1 day" +msgstr "1 jour" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "1 jour" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "1 mois" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "Toujours" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "Une erreur est survenue lors de la création du gist" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "Gist %s supprimé" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "non modifié" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "Le contenu du gist a été mis à jour avec succès" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "Les données du gist on été mises à jour avec succès" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "Une erreur est survenue durant la mise à jour du gist %s" @@ -451,67 +536,60 @@ #: kallithea/controllers/admin/my_account.py:70 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:127 +"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" +" fonctionnement de l’application" + +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, 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:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "Mot de passe mis à jour avec succès" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 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:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 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:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "Clé d'API créée avec succès" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "Clé d'API remise à zéro avec succès" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "Clé d'API supprimée avec succès" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Aucun" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -527,28 +605,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "Administration" @@ -570,26 +648,26 @@ msgstr "Autorisé avec activation de compte automatique" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "Activation manuelle du compte externe" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "Activation automatique du compte externe" @@ -605,21 +683,21 @@ msgid "Global permissions updated successfully" msgstr "Permissions globales mises à jour avec succès" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Une erreur est survenue durant la mise à jour des permissions" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "Groupe de dépôts %s créé" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, 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:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "Groupe de dépôts %s mis à jour" @@ -649,187 +727,188 @@ 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:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "Impossible de révoquer votre permission d'administrateur" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 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:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "Erreur de création du dépôt %s" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "Dépôt %s créé depuis %s" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "Dépôt %s créé" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, 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:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "%s forks détachés" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "%s forks supprimés" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "Dépôt %s supprimé" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "Permissions du dépôt mises à jour" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "Une erreur est survenue durant la création du champ" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "Une erreur est survenue durant la suppression du champ" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "-- Pas un fork --" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:526 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:526 +#: kallithea/controllers/admin/repos.py:530 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:531 kallithea/model/validators.py:359 +"Une erreur est survenue durant la configuration du journal public pour ce" +" dépôt" + +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "[Aucun dépôt]" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "Dépôt verrouillé" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "Dépôt non verrouillé" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "Non verrouillé" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "Verrouillé" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "Le dépôt a été %s" -#: kallithea/controllers/admin/repos.py:618 +#: kallithea/controllers/admin/repos.py:622 msgid "Cache invalidation successful" msgstr "Invalidation du cache réalisée avec succès" -#: kallithea/controllers/admin/repos.py:622 +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 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:673 +#: kallithea/controllers/admin/repos.py:677 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:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -"Impossible d'activer la prise en charge de hgsubversion. La bibliothèque « " -"hgsubversion » est manquante" - -#: kallithea/controllers/admin/settings.py:182 +"Impossible d'activer la prise en charge de hgsubversion. La bibliothèque " +"« hgsubversion » est manquante" + +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -"Une erreur est survenue durant la mise à jour des réglages de l'application" - -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +"Une erreur est survenue durant la mise à jour des réglages de " +"l'application" + +#: kallithea/controllers/admin/settings.py:213 +#, fuzzy, 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:270 @@ -843,29 +922,30 @@ #: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "" -"Une erreur est survenue durant la mise à jour des réglages de visualisation" +"Une erreur est survenue durant la mise à jour des réglages de " +"visualisation" #: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "Veuillez entrer votre adresse e-mail" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "Tâche d'envoi d'e-mail créée" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:418 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée" @@ -874,107 +954,114 @@ msgid "Created user group %s" msgstr "Groupe d'utilisateurs %s créé" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, 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:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "Groupe d'utilisateurs %s mis à jour" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, 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:239 +msgstr "Une erreur est survenue durant la mise à jour du groupe d'utilisateurs %s" + +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "Groupe d'utilisateurs supprimé avec succès" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 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:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "Le groupe cible ne peut pas être le même" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "Permissions du groupe d'utilisateurs mises à jour" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "Permissions mises à jour" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "Utilisateur %s créé" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "Une erreur est survenue durant la création de l'utilisateur %s" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "Utilisateur supprimé avec succès" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "Vous ne pouvez pas éditer cet utilisateur" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "L'adresse IP %s a été ajoutée à la liste blanche" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "Une erreur est survenue durant la sauvegarde d'IP" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "L'adresse IP a été supprimée de la liste blanche" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "IP %s non autorisée" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 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:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "Ensemble de changements non trouvé" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Fichier binaire" @@ -989,241 +1076,266 @@ msgid "No changes detected" msgstr "Aucun changement détecté" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "Branche supprimée : %s" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "Étiquette créée : %s" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "Ensemble de changements non trouvé" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "vue de comparaison" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "et" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "%s de plus" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "révisions" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "nom du fork %s" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "Requête de pull #%s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:771 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: kallithea/lib/helpers.py:747 +#: kallithea/lib/helpers.py:775 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:781 msgid "[downloaded] archive from repository" msgstr "[téléchargée] archive depuis le dépôt" -#: kallithea/lib/helpers.py:755 +#: kallithea/lib/helpers.py:783 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:791 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:793 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:795 msgid "[created] user group" msgstr "[créé] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:797 msgid "[updated] user group" msgstr "[mis à jour] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:799 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:801 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:803 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:805 msgid "[pushed] into" msgstr "[a pushé] dans" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:807 msgid "[committed via Kallithea] into repository" msgstr "[a commité via Kallithea] dans le dépôt" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:809 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr " et %s de plus" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "Aucun fichier" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "nouveau fichier" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "suppr." -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "renommer" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, 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 "" -"Le dépôt %s n’est pas représenté dans la base de données. Il a probablement " -"été créé ou renommé manuellement. Veuillez relancer l’application pour " -"rescanner les dépôts" - -#: kallithea/lib/utils2.py:415 +"Le dépôt %s n’est pas représenté dans la base de données. Il a " +"probablement été créé ou renommé manuellement. Veuillez relancer " +"l’application pour rescanner les dépôts" + +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "dans %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "dans %s et %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "à l’instant" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "Aucun accès au dépôt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "Accès en lecture au dépôt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1233,12 +1345,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "Aucun accès au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "Accès en écriture au dépôt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1248,162 +1360,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" -msgstr "Accès en lecture au dépôt" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" +msgstr "Accès administrateur au dépôt" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" -msgstr "Accès en écriture au dépôt" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" +msgstr "Aucun accès au groupe de dépôts" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" -msgstr "Accès administrateur au dépôt" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "Accès en lecture au groupe de dépôts" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" +msgstr "Accès en écriture au groupe de dépôts" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "Aucun accès au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" -msgstr "Accès en lecture au groupe de dépôts" +msgid "Repository Group admin access" +msgstr "Accès administrateur au groupe de dépôts" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" -msgstr "Accès en écriture au groupe de dépôts" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" +msgstr "Administrateur Kallithea" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" -msgstr "Accès administrateur au groupe de dépôts" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "Création de dépôt désactivée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" +msgstr "Création de dépôt activée" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "Administrateur Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "Création de dépôt désactivée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" -msgstr "Création de dépôt activée" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "Fork de dépôt désactivé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "Fork de dépôt activé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" +msgstr "Enregistrement désactivé" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "Fork de dépôt désactivé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "Fork de dépôt activé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" -msgstr "Enregistrement désactivé" +msgid "Register new user with Kallithea with manual activation" +msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "Pas encore relue" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "Approuvée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1413,12 +1525,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "Pas encore relue" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "Rejetée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1428,52 +1540,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "Approuvée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "Rejetée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "En cours de relecture" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "niveau supérieur" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "Groupe de dépôts, pas d'accès" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "Groupe de dépôts, accès en lecture" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1482,9 +1588,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" -msgstr "Groupe de dépôts, pas d'accès" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" +msgstr "Groupe de dépôts, accès en écriture" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1494,23 +1600,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "Groupe de dépôts, accès en lecture" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "Groupe de dépôts, accès en écriture" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "Groupe de dépôts, accès d'administration" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1518,9 +1611,20 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" -msgstr "Groupe de dépôts, accès d'administration" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "Groupe d'utilisateurs, pas d'accès" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" +msgstr "Groupe d'utilisateurs, accès en lecture" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1529,9 +1633,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" -msgstr "Groupe d'utilisateurs, pas d'accès" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" +msgstr "Groupe d'utilisateurs, accès en écriture" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1540,20 +1644,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "Groupe d'utilisateurs, accès en lecture" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" -msgstr "Groupe d'utilisateurs, accès en écriture" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" +msgstr "Groupe d'utilisateurs, accès d'administration" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1562,21 +1655,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "Groupe d'utilisateurs, accès d'administration" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "Création de groupes de dépôts désactivée" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "Création de groupes de dépôts activée" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1584,32 +1677,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "Création de groupes de dépôts activée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "Création de groupes d'utilisateurs désactivée" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "Création de groupes d'utilisateurs activée" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "Enregistrement désactivé" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1617,51 +1721,30 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "Enregistrement désactivé" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "Enregistrement des utilisateurs avec activation de compte automatique" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -"Création de dépôts activée avec l'accès en écriture vers un groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +"Création de dépôts activée avec l'accès en écriture vers un groupe de " +"dépôts" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "" "Création de dépôts désactivée avec l'accès en écriture vers un groupe de " "dépôts" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "à la ligne %s" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "[Mention]" @@ -1687,99 +1770,149 @@ msgid "Name must not contain only digits" msgstr "Le nom ne doit pas contenir seulement des chiffres" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s a commenté sur le changeset à %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s a envoyé un message à %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s vous a mentionné à %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s s'est enregistré sur Kallithea à %(when)s" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s a ouvert une nouvelle demande de pull à %(when)s" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s a commenté la demande de pull à %(when)s" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, fuzzy, python-format +msgid "New user %(new_username)s registered" +msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +#, fuzzy +msgid "Closing" +msgstr "en utilisant l’adresse" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -"%(user)s veut que vous regardiez la demande de pull #%(pr_id)s : %(pr_title)s" - -#: kallithea/model/scm.py:810 +"%(user)s veut que vous regardiez la demande de pull #%(pr_id)s : " +"%(pr_title)s" + +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "Dernier sommet" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "Nouveau enregistrement d'utilisateur" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 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/model/user.py:270 +"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" +" fonctionnement de l’application" + +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for 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:276 -#, python-format +"Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " +"bon fonctionnement de l’application" + +#: kallithea/model/user.py:261 +#, fuzzy, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" msgstr "" "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " "les propriétaires de ces dépôts. %s" -#: kallithea/model/user.py:304 +#: kallithea/model/user.py:268 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" +"L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " +"les propriétaires de ces dépôts. %s" + +#: kallithea/model/user.py:275 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" +"L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " +"les propriétaires de ces dépôts. %s" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "Lien de remise à zéro du mot de passe" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "Votre nouveau mot de passe" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "Votre nouveau mot de passe Kallithea : %s" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "Cette valeur ne peut être une liste vide" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Le nom d’utilisateur « %(username)s » existe déjà" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" @@ -1788,25 +1921,25 @@ "tirets, points, traits d'union et doit commencer avec un caractère " "alphanumérique ou un trait d'union" -#: kallithea/model/validators.py:151 +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "L'entrée n'est pas valide" -#: kallithea/model/validators.py:158 +#: kallithea/model/validators.py:139 #, python-format msgid "Username %(username)s is not valid" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:158 msgid "Invalid user group name" msgstr "Nom de groupe d'utilisateurs invalide" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Le groupe d'utilisateurs « %(usergroup)s » existe déjà" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1815,149 +1948,151 @@ "alphanumériques, des tirets, des points, des traits d'union et doit " "commencer avec un caractère alphanumérique" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "Impossible d’assigner ce groupe en tant que parent" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Le groupe « %(group_name)s » existe déjà" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, 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:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "Caractères incorrects (non-ASCII) dans le mot de passe" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "Ancien mot de passe invalide" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:291 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas" -#: kallithea/model/validators.py:327 +#: kallithea/model/validators.py:308 msgid "invalid password" msgstr "mot de passe invalide" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:309 msgid "invalid user name" msgstr "nom d’utilisateur invalide" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:310 msgid "Your account is disabled" msgstr "Votre compte est désactivé" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, 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:376 +#: kallithea/model/validators.py:357 #, 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:378 +#: kallithea/model/validators.py:359 #, 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:493 -msgid "invalid clone url" +#: kallithea/model/validators.py:474 +#, fuzzy +msgid "invalid clone URL" msgstr "URL de clonage invalide" -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +#: kallithea/model/validators.py:475 +#, fuzzy +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" msgstr "" "URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou " "svn+http(s)" -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:500 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:534 +#: kallithea/model/validators.py:515 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:536 +#: kallithea/model/validators.py:517 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:585 +#: kallithea/model/validators.py:566 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:626 +#: kallithea/model/validators.py:607 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:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "Cette adresse e-mail est déjà enregistrée" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "L’adresse e-mail « %(email)s » n’existe pas." -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -"L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom " -"d’utilisateur" - -#: kallithea/model/validators.py:804 +"L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" +" d’utilisateur" + +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" "Les révisions %(revs)s font déjà partie de la requête de pull ou on des " "statuts définis" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "Veuillez entrer une adresse IPv4 ou IPv6 valide" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, 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:870 +#: kallithea/model/validators.py:851 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:884 +#: kallithea/model/validators.py:865 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:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -"Les greffons %(loaded)s et %(next_to_load)s exportent tous les deux vers le " -"même nom" - -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +"Les greffons %(loaded)s et %(next_to_load)s exportent tous les deux vers " +"le même nom" + +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "À propos" @@ -1968,35 +2103,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "Filtre rapide…" #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "Dépôts" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "Ajouter un dépôt" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "Ajouter un groupe de dépôts" @@ -2013,164 +2149,165 @@ msgstr "Nom du groupe" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "Description" -#: kallithea/templates/index_base.html:126 +#: kallithea/templates/index_base.html:129 #: kallithea/templates/admin/my_account/my_account_repos.html:46 #: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 #: kallithea/templates/admin/repos/repo_add_base.html:9 #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 #: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks.html:49 #: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 +#: kallithea/templates/branches/branches.html:49 #: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 #: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "Nom" -#: kallithea/templates/index_base.html:129 +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "Dernière modification" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "Sommet" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "Propriétaire" -#: kallithea/templates/index_base.html:141 +#: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "Tri ascendant" -#: kallithea/templates/index_base.html:142 +#: kallithea/templates/index_base.html:145 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 msgid "Click to sort descending" msgstr "Tri descendant" -#: kallithea/templates/index_base.html:143 +#: kallithea/templates/index_base.html:146 msgid "No repositories found." msgstr "Pas de dépôts trouvés." -#: kallithea/templates/index_base.html:144 +#: kallithea/templates/index_base.html:147 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 msgid "Data error." msgstr "Erreur d’intégrité des données." -#: kallithea/templates/index_base.html:145 +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "Chargement…" -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "Connexion" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "Se connecter à %s" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "Nom d’utilisateur" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "Mot de passe" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "Se souvenir de moi" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "Connexion" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" @@ -2178,78 +2315,85 @@ msgid "Password Reset" msgstr "Remettre le mot de passe à zéro" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" +#: kallithea/templates/password_reset.html:12 +#, fuzzy, python-format +msgid "Reset Your Password to %s" msgstr "Remettre votre mot de passe à %s" -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" +#: kallithea/templates/password_reset.html:14 +#, fuzzy +msgid "Reset Your Password" msgstr "Remettre votre mot de passe à zéro" -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "Adresse e-mail" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "Captcha" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" +#: kallithea/templates/password_reset.html:46 +#, fuzzy +msgid "Send Password Reset Email" msgstr "Envoyer le courriel de remise à zéro du mot de passe" -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" +#: kallithea/templates/password_reset.html:47 +#, fuzzy +msgid "" +"Password reset link will be sent to the email address matching your " +"username." msgstr "Votre nouveau mot de passe sera envoyé à l’adresse correspondante" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "Inscription" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "S'inscrire sur %s" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "Confirmation" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "Prénom" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "Nom" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "Votre compte utilisateur sera actif dès la fin de l’enregistrement" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" -msgstr "Votre compte utilisateur devra être activé par un administrateur" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." +msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "Aucune branche n’a été créée pour le moment" @@ -2268,38 +2412,40 @@ msgstr "Aucun signet n’a été créé" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +#, fuzzy +msgid "Admin Journal" msgstr "Historique d’administration" -#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/admin/admin.html:10 msgid "journal filter..." msgstr "filtre du journal…" -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +#, fuzzy +msgid "Filter" msgstr "filtre" -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "%s entrée" msgstr[1] "%s entrées" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "Action" @@ -2309,11 +2455,11 @@ msgstr "Dépôt" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Date" @@ -2330,92 +2476,94 @@ msgid "Authentication Settings" msgstr "Réglages d'authentification" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "Authentification" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "Greffons d'authentification" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" -msgstr "Greffons d'authentification" - -#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Enabled Plugins" msgstr "Greffons activés" -#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/templates/admin/auth/auth_settings.html:33 msgid "" "Comma separated list of plugins. Order of plugins is also order in which " "Kallithea will try to authenticate user" msgstr "" -"Une liste séparée avec des virgules des greffons. L'ordre des greffons est " -"aussi celui dans lequel Kallithea va essayer d'authentifier un utilisateur" - -#: kallithea/templates/admin/auth/auth_settings.html:37 +"Une liste séparée avec des virgules des greffons. L'ordre des greffons " +"est aussi celui dans lequel Kallithea va essayer d'authentifier un " +"utilisateur" + +#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Available built-in plugins" msgstr "Greffons inclus disponibles" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "activé" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "désactivé" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "Greffon" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "Enregistrer" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "Greffon" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" msgstr "Réglages par défaut des dépôts" -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "Par défaut" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "Type" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "Dépôt privé" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2423,73 +2571,73 @@ "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " "comme collaborateurs." -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "Activer les statistiques" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "Activer les téléchargements" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 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:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "Activer le verrouillage" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 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:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "Modifier le gist" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -"Le gist a été mis à jour depuis que vous avez commencé à éditer. Copier vos " -"changements et cliquez %(here)s pour charger la nouvelle version." - -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +"Le gist a été mis à jour depuis que vous avez commencé à éditer. Copier " +"vos changements et cliquez %(here)s pour charger la nouvelle version." + +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "Description du gist…" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 msgid "Gist lifetime" msgstr "Durée de vie du gist" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "Expire le" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2497,75 +2645,69 @@ msgid "never" msgstr "jamais" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "brut" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Mettre à jour le gist" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "Annuler" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, fuzzy, python-format +msgid "Private Gists for User %s" msgstr "Gists privés de l'utilisateur %s" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, fuzzy, python-format +msgid "Public Gists for User %s" msgstr "Gists publics de l'utilisateur %s" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "Gists publics" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "Créer un nouveau gist" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "Créé" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "Il n'y a actuellement pas de gists" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "Nouveau gist" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "nommez ce fichier…" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "Créer un gist privé" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "Créer un gist public" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2573,118 +2715,115 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "Réinitialiser" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "Gist" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "Gist public" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "Gist privé" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "Supprimer" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "Confirmer la supprisson de ce gist" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Modifier" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "Montrer en brut" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "créé" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "Montrer en brut" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "Mon compte" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "Mon compte" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "Profil" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +#, fuzzy +msgid "API Keys" +msgstr "Nouvelle clé d'API" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" -msgstr "Profil" +msgid "My Emails" +msgstr "Mes e-mails" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" +msgstr "Mes dépôts" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" -msgstr "Clés d'API" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" +msgstr "Surveillé" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "Mes e-mails" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "Mes dépôts" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "Surveillé" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "Requêtes de pull" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +#, fuzzy +msgid "My Permissions" msgstr "Mes permissions" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2755,7 +2894,6 @@ msgstr "Primaire" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2776,7 +2914,8 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +#, fuzzy +msgid "No additional emails specified." msgstr "Pas d'adresses courriel supplémentaires spécifiées" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2785,7 +2924,8 @@ msgstr "Nouvelle adrese" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" +#, fuzzy +msgid "Change Your Account Password" msgstr "Changer le mot de passe de votre compte" #: kallithea/templates/admin/my_account/my_account_password.html:7 @@ -2801,116 +2941,77 @@ msgid "Confirm new password" msgstr "Confirmer le nouveau mot de passe" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "Vous pouvez changer votre avatar sur" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/my_account/my_account_profile.html:12 #: kallithea/templates/admin/users/user_edit_profile.html:9 msgid "Using" msgstr "en utilisant l’adresse" -#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/my_account/my_account_profile.html:14 #: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "Les avatars sont désactivés" -#: kallithea/templates/admin/my_account/my_account_profile.html:13 +#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." -msgstr "" -"Adresse courriel manquante, veuillez mettre à jour votre adresse courriel." - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 +msgstr "Adresse courriel manquante, veuillez mettre à jour votre adresse courriel." + +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "adresse IP actuelle" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "Montrer les demandes de pull fermées" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "Ouvertes par moi" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "Requête de pull nº%s ouverte le %s" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "Fermée" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "Veuillez confirmer la suppression de cette requête de pull" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "Rien ici pour le moment" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "Je participe à" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "Requête de pull nº%s ouverte par %s le %s" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" +#, fuzzy +msgid "Repositories You Own" msgstr "Dépôts dont vous êtes le propriétaire" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "Aucun élément n’a été trouvé." #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" +#, fuzzy +msgid "Repositories You are Watching" msgstr "Dépôts que vous surveillez" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "Mes notifications" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "Tous" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "Commentaires" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "Demandes de pull" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +#, fuzzy +msgid "Mark All Read" msgstr "Tout marquer comme lu" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2918,38 +3019,41 @@ msgstr "Aucune notification pour le moment" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" +#: kallithea/templates/admin/notifications/show_notification.html:11 +#, fuzzy +msgid "Show Notification" msgstr "Notification" -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "Notifications" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" +#, fuzzy +msgid "Permissions Administration" msgstr "Gestion des permissions" -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "Permissions" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "Global" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +#, fuzzy +msgid "IP Whitelist" msgstr "Liste blanche d'adresses IP" -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "Vue d'ensemble" @@ -2958,10 +3062,10 @@ msgstr "Accès anonyme" #: kallithea/templates/admin/permissions/permissions_globals.html:13 -#, python-format +#, fuzzy, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" "Autoriser l'accès à Kallithea sans le besoin de se connecter. Les " "utilisateurs anonymes ont les permissions de %s" @@ -2983,7 +3087,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "Groupe de dépôt" @@ -3016,8 +3120,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3037,7 +3141,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +#, fuzzy +msgid "Default IP Whitelist for All Users" msgstr "Liste blanche d'adresses IP par défaut pour tous les utilisateurs" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -3048,7 +3153,8 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +#, fuzzy +msgid "All IP addresses are allowed." msgstr "Toutes les adresses IP sont autorisées" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -3057,68 +3163,64 @@ msgstr "Nouvelle adresse IP" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" +#, fuzzy +msgid "Default User Permissions Overview" msgstr "Vue d'ensemble des permissions utilisateur par défaut" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "Ajouter un groupe de dépôts" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" msgstr "Groupes de dépôts" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "Nom de groupe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Parent du groupe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "Copier les permissions du groupe parent" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, python-format -msgid "%s Repository group settings" +#, fuzzy, python-format +msgid "%s Repository Group Settings" msgstr "Réglages du groupe de dépôts %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "Groupes de dépôts" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "Ajouter un groupe enfant" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "Options" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "Avancé" @@ -3142,7 +3244,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "Créé le" @@ -3240,62 +3342,67 @@ "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" +"Activer le verrou lors d’un pull sur le groupe. Cette option sera " +"appliquée à tous les sous-groupes et dépôts de ce groupe" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "Confirmer la suppression de cette adresse IP : %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "Tableau de bord du groupe de dépôts %s" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "Accueil" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "comprenant" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" +#, fuzzy +msgid "Repository Groups Administration" msgstr "Administration des groupes de dépôts" -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "groupes de dépôts" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#, fuzzy +msgid "Number of Top-level Repositories" msgstr "Nombre de sous-dépôts" -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" -msgstr "Ajouter un dépôt" - #: kallithea/templates/admin/repos/repo_add_base.html:14 msgid "Import existing repository ?" msgstr "Importer un dépôt existant ?" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "Cloner depuis" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +#, fuzzy +msgid "Optional URL from which repository should be cloned." msgstr "URL http(s) depuis laquelle le dépôt doit être cloné." #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Gardez cette description précise et concise. Utilisez un fichier README " "pour des descriptions plus détaillées." #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3304,7 +3411,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "Révision d’arrivée" @@ -3315,167 +3422,182 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" +#, fuzzy, python-format +msgid "%s Creating Repository" msgstr "%s Création du dépôt" -#: kallithea/templates/admin/repos/repo_creating.html:16 +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "Création du dépôt" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "Réglages du groupe de dépôts %s" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "Statistiques" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "Fork de" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +#, fuzzy +msgid "Parent" +msgstr "Parent du groupe" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" +#, fuzzy +msgid "Manually set this repository as a fork of another from the list." msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#, fuzzy +msgid "Public Journal Visibility" +msgstr "Journal public" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "Supprimer du journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +#, fuzzy +msgid "Add to Public Journal" +msgstr "Journal public" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 +#, fuzzy msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" -msgstr "" -"Le descriptif des actions réalisées sur ce dépôt sera visible à tous depuis " -"le journal public" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" +"Le descriptif des actions réalisées sur ce dépôt sera visible à tous " +"depuis le journal public" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +#, fuzzy +msgid "Change Locking" +msgstr "Activer le verrouillage" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +#, fuzzy +msgid "Confirm to unlock repository." msgstr "Veuillez confirmer le déverrouillage de ce dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "Dépôt non verrouillé" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." msgstr "Veuillez confirmer le verrouillage de ce dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "Dépôt non verrouillé" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "Ce dépôt n’est pas verrouillé" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, 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:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "Supprimer ce groupe de dépôts" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +#, fuzzy +msgid "Invalidate Repository Cache" msgstr "Invalider le cache du dépôt" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +#, fuzzy +msgid "Confirm to invalidate repository cache." msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#, fuzzy msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" -msgstr "" -"Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce dépôt, " -"il sera à nouveau mis en cache" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." +msgstr "" +"Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce " +"dépôt, il sera à nouveau mis en cache" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +#, fuzzy +msgid "List of Cached Values" msgstr "Liste des valeurs en cache" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3488,12 +3610,12 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "Actif" @@ -3527,27 +3649,31 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" -msgstr "" +#, fuzzy +msgid "Extra fields are disabled." +msgstr "Les avatars sont désactivés" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "private repository" msgstr "Dépôt privé" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" -msgstr "" +#, fuzzy +msgid "Remote URL" +msgstr "URL de clone" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +#, fuzzy +msgid "Pull Changes from Remote Location" msgstr "Récupérer les changements depuis le site distant" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +#, fuzzy +msgid "Confirm to pull changes from remote side." msgstr "Voulez-vous vraiment récupérer les changements depuis le site distant ?" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3555,7 +3681,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3565,15 +3691,17 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" +#: kallithea/templates/summary/summary.html:72 +#, fuzzy +msgid "Clone URL" msgstr "URL de clone" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 @@ -3594,15 +3722,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." -msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." +msgid "URL used for doing remote pulls." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 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 " @@ -3621,47 +3744,52 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" +#, fuzzy +msgid "Reset Statistics" msgstr "Remettre les statistiques à zéro" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +#, fuzzy +msgid "Confirm to remove current statistics." msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" +#, fuzzy +msgid "Repositories Administration" msgstr "Administration des dépôts" -#: kallithea/templates/admin/repos/repos.html:54 +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "État" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" +#, fuzzy +msgid "Settings Administration" msgstr "Administration générale" -#: kallithea/templates/admin/settings/settings.html:40 +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "VCS" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "Visuel" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "Hooks" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" +#: kallithea/templates/admin/settings/settings.html:33 +#, fuzzy +msgid "Full Text Search" msgstr "Recherche dans le texte complet" -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "Informations sytème" @@ -3730,37 +3858,45 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "Code Google Analytics" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "Clé publique ReCaptcha" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "Clé publique pour le système reCaptcha." -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "Clé privée ReCaptcha" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 +#, fuzzy msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" +"on registration." msgstr "" "Clé privée pour le système reCaptcha. Définir cette valeur activera le " "captcha d'enregistrement" -#: kallithea/templates/admin/settings/settings_global.html:55 +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" msgstr "Enregister les options" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3770,10 +3906,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" +#, fuzzy +msgid "Custom Hooks" msgstr "Hooks personnalisés" -#: kallithea/templates/admin/settings/settings_hooks.html:69 +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "Erreur lors de la suppression du hook" @@ -3787,9 +3924,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3797,19 +3933,18 @@ msgstr "Invalider le cache pour tous les dépôts" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." -msgstr "" +#, fuzzy +msgid "Check this to reload data and clear cache keys for all repositories." +msgstr "Invalider le cache pour tous les dépôts" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3826,7 +3961,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3851,11 +3986,13 @@ msgstr "Plateforme" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" +#, fuzzy +msgid "Git version" msgstr "Version de Git" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +#, fuzzy +msgid "Git path" msgstr "Chemin de Git" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3863,7 +4000,8 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +#, fuzzy +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:14 @@ -3871,7 +4009,8 @@ msgstr "Vérification des mises à jour…" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +#, fuzzy +msgid "Python Packages" msgstr "Paquets Python" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3883,13 +4022,14 @@ msgstr "Nécessiter SSL pour les opérations de VCS" #: kallithea/templates/admin/settings/settings_vcs.html:13 +#, fuzzy msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." -msgstr "" -"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour " -"pousser ou tirer. Si le certificate SSL est manquant, une erreur HTTP 406 " -"Not Acceptable sera retournée." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" +"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour" +" pousser ou tirer. Si le certificate SSL est manquant, une erreur HTTP " +"406 Not Acceptable sera retournée." #: kallithea/templates/admin/settings/settings_vcs.html:24 msgid "Show repository size after push" @@ -3908,7 +4048,8 @@ msgstr "Mettre à jour les dépôts après un push (hg update)" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +#, fuzzy +msgid "Mercurial extensions" msgstr "Extensions Mercurial" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3920,16 +4061,18 @@ msgstr "Activer l'extension hgsubversion" #: kallithea/templates/admin/settings/settings_vcs.html:53 +#, fuzzy msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." -msgstr "" -"La bibliothèque hgsubversion doit être installée. Elle permet de cloner des " -"dépôts SVN distants et de les migrer vers Mercurial." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." +msgstr "" +"La bibliothèque hgsubversion doit être installée. Elle permet de cloner " +"des dépôts SVN distants et de les migrer vers Mercurial." #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "Emplacement des dépôts" +#, fuzzy +msgid "Location of repositories" +msgstr "Dépôts totaux" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" @@ -3941,8 +4084,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3971,8 +4114,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3988,8 +4131,10 @@ #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -4002,71 +4147,73 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "Icônes" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo 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:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo 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:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +#, fuzzy +msgid "Show public/private icons next to repository names." +msgstr "Afficher l’icône de dépôt public sur les dépôts" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "Meta-tagging" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -4076,19 +4223,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "Permissions par défaut" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "Membres" @@ -4107,7 +4249,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "" @@ -4115,23 +4257,16 @@ msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "Tout enlever" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "Membres disponibles" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "Tout ajouter" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_groups.html:13 +#, fuzzy +msgid "User Groups Administration" +msgstr "Administration des groupes de dépôts" + +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4139,18 +4274,19 @@ msgid "Add user" msgstr "Ajouter un utilisateur" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "Utilisateurs" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "Confirmation" @@ -4159,14 +4295,15 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +msgid "Default Permissions" +msgstr "Permissions par défaut" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4178,6 +4315,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4224,193 +4362,191 @@ msgstr "Confirmation du nouveau mot de passe" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" +#, fuzzy +msgid "Users Administration" msgstr "Administration des utilisateurs" -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "Utilisateurs" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" -msgstr "" - #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +#, fuzzy +msgid "Create Fork" +msgstr "créé" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Résumé" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "Historique" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Fichiers" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 msgid "Options" msgstr "Options" -#: kallithea/templates/base/base.html:166 +#: kallithea/templates/base/base.html:158 #: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +#, fuzzy +msgid "Compare Fork" msgstr "Comparer le fork" -#: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 +#: kallithea/templates/branches/branches.html:56 #: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 +#: kallithea/templates/tags/tags.html:56 #: kallithea/templates/tags/tags_data.html:13 msgid "Compare" msgstr "Comparer" -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Rechercher" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:166 msgid "Unlock" msgstr "" +#: kallithea/templates/base/base.html:168 +msgid "Lock" +msgstr "" + #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Fork" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" +#: kallithea/templates/base/base.html:224 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:225 +#: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 +msgid "Journal" +msgstr "Historique" + +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 +msgid "Public journal" +msgstr "Journal public" + +#: kallithea/templates/base/base.html:236 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:237 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:241 +#, fuzzy +msgid "All Public Gists" +msgstr "Gists publics" + +#: kallithea/templates/base/base.html:243 +#, fuzzy +msgid "My Public Gists" +msgstr "Gists publics" + +#: kallithea/templates/base/base.html:244 +#, fuzzy +msgid "My Private Gists" +msgstr "Gist privé" + +#: kallithea/templates/base/base.html:249 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#, fuzzy +msgid "My Pull Requests" +msgstr "Requêtes de pull" + +#: kallithea/templates/base/base.html:292 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:299 +#, fuzzy +msgid "Login to Your Account" msgstr "Connexion à votre compte" -#: kallithea/templates/base/base.html:263 +#: kallithea/templates/base/base.html:322 msgid "Forgot password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/base/base.html:286 +#: kallithea/templates/base/base.html:347 msgid "Log Out" msgstr "Se déconnecter" -#: kallithea/templates/base/base.html:311 -msgid "Show recent activity" -msgstr "" - -#: kallithea/templates/base/base.html:312 -#: kallithea/templates/journal/journal.html:4 -msgid "Journal" -msgstr "Historique" - -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 -msgid "Public journal" -msgstr "Journal public" - -#: kallithea/templates/base/base.html:323 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:324 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 -msgid "Search in repositories" -msgstr "" - -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4471,112 +4607,122 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" +msgstr "%d commentaire" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "Suivre ce dépôt" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "Groupe" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "Membres" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +#, fuzzy +msgid "Open New Pull Request" +msgstr "Nouvelle requête de pull" + +#: kallithea/templates/base/root.html:32 +#, fuzzy +msgid "Open New Pull Request for Selected Changesets" msgstr "Nouvelle requête de pull" -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" -msgstr "" - -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +#, fuzzy +msgid "Show Selected Changeset __S" +msgstr "Sélectionner le changeset" + +#: kallithea/templates/base/root.html:35 +#, fuzzy +msgid "Selection Link" msgstr "Lien vers la sélection" -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +#, fuzzy +msgid "Collapse Diff" +msgstr "Diff de fichier" + +#: kallithea/templates/base/root.html:37 +#, fuzzy +msgid "Expand Diff" +msgstr "Diff de fichier" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" -msgstr "" +#: kallithea/templates/base/root.html:39 +#, fuzzy +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "Impossible de révoquer votre permission d'administrateur" + +#: kallithea/templates/base/root.html:43 +#, fuzzy +msgid "Specify changeset" +msgstr "Sélectionner le changeset" #: kallithea/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "Signets de %s" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "Auteur" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "Révision" @@ -4586,7 +4732,7 @@ msgid "%s Branches" msgstr "Branches de %s" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4602,326 +4748,371 @@ msgstr[0] "Affichage de %d révision sur %d" msgstr[1] "Affichage de %d révisions sur %d" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "Afficher" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "Veuillez confirmer le verrouillage de ce dépôt" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "Afficher" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +#, fuzzy +msgid "Branch filter:" +msgstr "filtre" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "Ajouter ou téléverser des fichiers directement via Kallithea" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "Pusher le nouveau dépôt" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "Le dépôt existe déjà ?" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "Changeset de %s" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "Statut du changeset" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d commentaire" -msgstr[1] "%d commentaires" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "(et %d en ligne)" -msgstr[1] "(et %d en ligne)" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "Fusion" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +#, fuzzy +msgid "Grafted from:" +msgstr "Créé le" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "Changement de statut -> %s" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +#, fuzzy +msgid "No title" +msgstr "nouveau fichier" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +#, fuzzy +msgid "Comment from pull request" +msgstr "[a commenté] la requête de pull pour" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "Envoi…" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" +msgstr "%d commentaire" + +#: kallithea/templates/changeset/changeset_file_comment.html:67 msgid "Commenting on line {1}." msgstr "Commentaire sur la ligne {1}." -#: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" "Les commentaires sont analysés avec la syntaxe %s, avec le support de la " "commande %s." -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" -msgstr "" -"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à l’" -"utilisateur Kallithea en question" - -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +#, fuzzy +msgid "Use @username inside this text to notify another user" +msgstr "" +"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " +"l’utilisateur Kallithea en question" #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +#, fuzzy +msgid "Submitting ..." +msgstr "Envoi…" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "Commentaire" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "Vous devez être connecté pour poster des commentaires." -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "Se connecter maintenant" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "Masquer" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d commentaire" +msgstr[1] "%d commentaires" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "(et %d en ligne)" +msgstr[1] "(et %d en ligne)" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +#, fuzzy +msgid "Use @username inside this text to send notification to another local user." +msgstr "" +"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " +"l’utilisateur Kallithea en question" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" +msgstr "Statut du changeset" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "Aucun changement" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(fermé)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "Changesets de %s" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "Fichiers affectés" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4929,13 +5120,15 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" -msgstr "" +#: kallithea/templates/changeset/diff_block.html:87 +#, fuzzy +msgid "Deleted" +msgstr "Supprimer" + +#: kallithea/templates/changeset/diff_block.html:90 +#, fuzzy +msgid "Renamed" +msgstr "renommer" #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -4945,30 +5138,55 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +#, fuzzy +msgid "is" +msgstr "Gist" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "Changesets de %s" + +#: kallithea/templates/compare/compare_cs.html:85 +#, fuzzy +msgid "behind" +msgstr "Mettre à jour l’index" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4976,38 +5194,43 @@ msgstr[1] "" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "Dépôt Mercurial" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "Dépôt Git" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "Dépôt public" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "Dépôt vide" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "S’abonner au flux RSS de %s" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "S’abonner au flux ATOM de %s" @@ -5016,17 +5239,22 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 @@ -5034,11 +5262,11 @@ msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "" @@ -5046,67 +5274,51 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "Titre" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +#: kallithea/templates/email_templates/pull_request.html:5 +#, fuzzy, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%(user)s a commenté la demande de pull à %(when)s" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, fuzzy, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "Ajouter un relecteur à cette requête de pull." + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "[a commenté] la requête de pull pour" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "Montrer les demandes de pull fermées" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "Vous serez redirigé vers %s dans %s secondes" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "Diff de fichier" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "Fichiers de %s" @@ -5116,85 +5328,84 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "Ajouter un nouveau fichier" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Emplacement" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "ou" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" msgstr "Commiter les changements" -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 +#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:29 +#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "Chargement de la liste des fichiers…" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "Taille" -#: kallithea/templates/files/files_browser.html:43 +#: kallithea/templates/files/files_browser.html:62 msgid "Mimetype" msgstr "Type MIME" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "Dernière révision" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" +#: kallithea/templates/files/files_browser.html:64 +#, fuzzy +msgid "Last Modified" msgstr "Dernière modification" -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:65 +#, fuzzy +msgid "Last Committer" msgstr "Dernier commiteur" #: kallithea/templates/files/files_delete.html:4 @@ -5202,8 +5413,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5212,32 +5423,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "Édition du fichier" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5282,12 +5489,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "Fichier binaire (%s)" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "Ce fichier est trop gros pour être affiché" @@ -5308,9 +5515,9 @@ msgid "%s Followers" msgstr "Followers de %s" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "Followers" @@ -5323,31 +5530,38 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "Nom du fork" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +#, fuzzy +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" +"Révision par défaut pour les pages de fichiers, de téléchargements, de " +"recherche et de documentation" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "Privé" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "Copier les permissions" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "Copier les permissions depuis le dépôt forké" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "MÀJ après le clonage" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "Mettre à jour depuis la source après clonage" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5356,9 +5570,9 @@ msgid "%s Forks" msgstr "Forks de %s" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "Forks" @@ -5366,165 +5580,295 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "Flux ATOM du journal" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "Flux RSS du journal" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" msgstr "Mes dépôts" -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "Aucune entrée pour le moment" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Journal public" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "Flux ATOM du journal public" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "Flux RSS du journal public" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" +#, fuzzy +msgid "New Pull Request" msgstr "Nouvelle requête de pull" -#: kallithea/templates/pullrequests/pullrequest.html:44 +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "Titre" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" +#: kallithea/templates/pullrequests/pullrequest.html:72 +msgid "Destination repository" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +#, fuzzy +msgid "Pull Request Reviewers" msgstr "Relecteurs de la requête de pull" -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "Propriétaire" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "Ajouter un relecteur à cette requête de pull." - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "Comparaison détaillée" - -#: kallithea/templates/pullrequests/pullrequest.html:149 -msgid "Destination repository" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +#, fuzzy +msgid "No entries" +msgstr "Aucune entrée pour le moment" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, fuzzy, python-format +msgid "Latest vote: %s" +msgstr "Dernier sommet" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +#, fuzzy +msgid "Delete Pull Request" +msgstr "Nouvelle requête de pull" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "Veuillez confirmer la suppression de cette requête de pull" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "Fermée" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, fuzzy, python-format +msgid "Pull request #%s from %s#%s" +msgstr "Requête de pull nº%s ouverte le %s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#, fuzzy +msgid "Summarize the changes" +msgstr "Commiter les changements" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "Pas encore relue par" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d relecteur" msgstr[1] "%d relecteurs" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "Aucune branche n’a été créée pour le moment" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#, fuzzy +msgid "on" +msgstr "Aucune" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +#, fuzzy +msgid "Created by" +msgstr "créé" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +msgid "Update" +msgstr "[a mis à jour] l’utilisateur" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "Propriétaire" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "%d relecteur" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "%d relecteur" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" -msgstr "Vue de comparaison" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +#, fuzzy +msgid "Save as New Pull Request" +msgstr "Nouvelle requête de pull" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "Sélectionner le changeset" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +#, fuzzy +msgid "Pull Request Content" +msgstr "Requêtes de pull" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" -msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, fuzzy, python-format +msgid "Pull Requests from %s'" +msgstr "Requête de pull #%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, fuzzy, python-format +msgid "Pull Requests to '%s'" +msgstr "Requête de pull #%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, fuzzy, python-format +msgid "Show Pull Requests to %s" +msgstr "Requête de pull #%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, fuzzy, python-format +msgid "Show Pull Requests from '%s'" +msgstr "[a fermé] la requête de pull de" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#, fuzzy +msgid "Pull Requests Created by Me" +msgstr "Relecteurs de la requête de pull" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#, fuzzy +msgid "Pull Requests I Participate In" +msgstr "Je participe à" #: kallithea/templates/search/search.html:6 #, python-format @@ -5532,27 +5876,28 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" +#: kallithea/templates/search/search.html:16 +#, fuzzy +msgid "Search in All Repositories" msgstr "Rechercher dans tous les dépôts" -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "Termes de la recherches" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "Rechercher dans" -#: kallithea/templates/search/search.html:68 +#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "Le contenu des fichiers" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "Les messages de commit" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "Les noms de fichiers" @@ -5567,67 +5912,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "Statistiques obtenues : " -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "Fichiers" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:389 msgid "commits" msgstr "commits" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:390 msgid "files added" msgstr "fichiers ajoutés" +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "fichiers modifiés" + +#: kallithea/templates/summary/statistics.html:392 +msgid "files removed" +msgstr "fichiers supprimés" + #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" -msgstr "fichiers modifiés" +msgid "commit" +msgstr "commit" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" -msgstr "fichiers supprimés" +msgid "file added" +msgstr "fichier ajouté" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" +msgstr "fichié modifié" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "commit" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "fichier ajouté" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "fichié modifié" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "fichier supprimé" @@ -5636,78 +5981,80 @@ msgid "%s Summary" msgstr "Résumé de %s" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "URL de clone" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "Fork de" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "Afficher par nom" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "Afficher par ID" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "Populaires" +#: kallithea/templates/summary/summary.html:111 +msgid "Download" +msgstr "Téléchargements" + #: kallithea/templates/summary/summary.html:115 -msgid "Download" -msgstr "Téléchargements" - -#: kallithea/templates/summary/summary.html:119 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 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:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "Télécharger en ZIP" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 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:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "avec les sous-dépôts" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" -msgstr "" - -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" +msgstr "fichiers modifiés" + +#: kallithea/templates/summary/summary.html:191 +#, fuzzy +msgid "Quick Start" msgstr "Démarrage rapide" -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "Télécharger %s comme archive %s" @@ -5717,6 +6064,8 @@ msgid "%s Tags" msgstr "Tags de %s" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" -msgstr "" +#: kallithea/templates/tags/tags.html:26 +#, fuzzy +msgid "Compare Tags" +msgstr "vue de comparaison" +
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -1,93 +1,95 @@ -# Translations template for Kallithea. +# Hungarian translations for Kallithea. # Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. # Automatically generated, 2014. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 2.2.5\n" -"Report-Msgid-Bugs-To: marcin@maq.io\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"Project-Id-Version: Kallithea\n" +"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2014-07-02 19:08-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:94 -#: kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "" + +#: kallithea/controllers/changeset.py:382 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" - -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +"Changing status on a changeset associated with a closed pull request is " +"not allowed" +msgstr "" + +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:72 -msgid "Home page" +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:99 +msgid "Unauthorized access to resource" msgstr "" #: kallithea/controllers/error.py:101 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:104 -msgid "Unauthorized access to resource" -msgstr "" - -#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -104,12 +106,12 @@ msgstr "" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "" @@ -127,215 +129,286 @@ msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, python-format +msgid "%s at %s" +msgstr "" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:461 -msgid "No content" -msgstr "" - #: kallithea/controllers/files.py:465 +msgid "No content" +msgstr "" + +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:535 -#, python-format -msgid "Unknown revision %s" -msgstr "" - -#: kallithea/controllers/files.py:537 -msgid "Empty repository" -msgstr "" - #: kallithea/controllers/files.py:539 +#, python-format +msgid "Unknown revision %s" +msgstr "" + +#: kallithea/controllers/files.py:541 +msgid "Empty repository" +msgstr "" + +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:776 -#: kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:777 -#: kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" -"Your password reset was successful, new password has been sent to your email" -msgstr "" - -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" + +#: kallithea/controllers/pullrequests.py:130 +#, python-format +msgid "%s (closed)" msgstr "" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +msgid "Pull request update created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:503 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "" - -#: kallithea/controllers/pullrequests.py:522 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +msgid "Closing." msgstr "" #: kallithea/controllers/search.py:135 @@ -347,23 +420,24 @@ msgstr "" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" -msgstr "" - -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" -msgstr "" - -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +msgid "An error occurred during search operation." +msgstr "" + +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +msgid "No data ready yet" +msgstr "" + +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" @@ -371,68 +445,68 @@ msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -441,62 +515,55 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -512,28 +579,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "" @@ -555,26 +622,26 @@ msgstr "" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "" @@ -590,21 +657,21 @@ msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "" @@ -634,182 +701,182 @@ msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 -msgid "Updated repository visibility in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:526 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:618 -msgid "Cache invalidation successful" -msgstr "" - #: kallithea/controllers/admin/repos.py:622 +msgid "Cache invalidation successful" +msgstr "" + +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" #: kallithea/controllers/admin/settings.py:270 @@ -828,23 +895,23 @@ msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:414 -msgid "Updated hooks" -msgstr "" - #: kallithea/controllers/admin/settings.py:418 +msgid "Updated hooks" +msgstr "" + +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "" @@ -853,351 +920,383 @@ msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" #: kallithea/lib/diffs.py:82 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "" -#: kallithea/lib/helpers.py:743 -msgid "[deleted] repository" -msgstr "" - -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 -msgid "[created] repository" -msgstr "" - -#: kallithea/lib/helpers.py:747 -msgid "[created] repository as fork" -msgstr "" - -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 -msgid "[forked] repository" -msgstr "" - -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 -msgid "[updated] repository" -msgstr "" - -#: kallithea/lib/helpers.py:753 -msgid "[downloaded] archive from repository" -msgstr "" - -#: kallithea/lib/helpers.py:755 -msgid "[delete] repository" -msgstr "" - -#: kallithea/lib/helpers.py:763 -msgid "[created] user" -msgstr "" - -#: kallithea/lib/helpers.py:765 -msgid "[updated] user" -msgstr "" - -#: kallithea/lib/helpers.py:767 -msgid "[created] user group" -msgstr "" - -#: kallithea/lib/helpers.py:769 -msgid "[updated] user group" -msgstr "" - #: kallithea/lib/helpers.py:771 -msgid "[commented] on revision in repository" -msgstr "" - -#: kallithea/lib/helpers.py:773 -msgid "[commented] on pull request for" +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 +msgid "[created] repository" msgstr "" #: kallithea/lib/helpers.py:775 -msgid "[closed] pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:777 -msgid "[pushed] into" -msgstr "" - -#: kallithea/lib/helpers.py:779 -msgid "[committed via Kallithea] into repository" +msgid "[created] repository as fork" +msgstr "" + +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 +msgid "[forked] repository" +msgstr "" + +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 +msgid "[updated] repository" msgstr "" #: kallithea/lib/helpers.py:781 -msgid "[pulled from remote] into repository" +msgid "[downloaded] archive from repository" msgstr "" #: kallithea/lib/helpers.py:783 +msgid "[delete] repository" +msgstr "" + +#: kallithea/lib/helpers.py:791 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:793 +msgid "[updated] user" +msgstr "" + +#: kallithea/lib/helpers.py:795 +msgid "[created] user group" +msgstr "" + +#: kallithea/lib/helpers.py:797 +msgid "[updated] user group" +msgstr "" + +#: kallithea/lib/helpers.py:799 +msgid "[commented] on revision in repository" +msgstr "" + +#: kallithea/lib/helpers.py:801 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:803 +msgid "[closed] pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:805 +msgid "[pushed] into" +msgstr "" + +#: kallithea/lib/helpers.py:807 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:809 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, 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:415 +"%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:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1207,12 +1306,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1222,162 +1321,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" +msgid "Repository Group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" +msgid "Register new user with Kallithea with manual activation" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1387,12 +1486,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1402,52 +1501,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1456,8 +1549,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1468,23 +1561,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1492,8 +1572,19 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1503,8 +1594,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1514,19 +1605,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1536,21 +1616,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1558,32 +1638,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1591,49 +1682,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:77 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "" @@ -1659,254 +1727,298 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +msgid "Closing" +msgstr "" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:276 +#: kallithea/model/user.py:261 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:268 +#, 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:275 #, 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:304 +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:151 +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:139 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:158 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:177 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" +#: kallithea/model/validators.py:291 +msgid "Passwords do not match" +msgstr "" + +#: kallithea/model/validators.py:308 +msgid "invalid password" +msgstr "" + +#: kallithea/model/validators.py:309 +msgid "invalid user name" +msgstr "" + #: kallithea/model/validators.py:310 -msgid "Passwords do not match" -msgstr "" - -#: kallithea/model/validators.py:327 -msgid "invalid password" -msgstr "" - -#: kallithea/model/validators.py:328 -msgid "invalid user name" -msgstr "" - -#: kallithea/model/validators.py:329 msgid "Your account is disabled" msgstr "" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" -msgstr "" - -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" - -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:474 +msgid "invalid clone URL" +msgstr "" + +#: kallithea/model/validators.py:475 +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +msgstr "" + +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 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:804 +"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:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1917,35 +2029,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "" #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -1962,165 +2075,165 @@ msgstr "" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:126 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - #: kallithea/templates/index_base.html:129 +#: kallithea/templates/admin/my_account/my_account_repos.html:46 +#: kallithea/templates/admin/my_account/my_account_watched.html:46 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 +#: kallithea/templates/admin/repos/repo_add_base.html:9 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 +#: kallithea/templates/base/perms_summary.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:49 +#: kallithea/templates/bookmarks/bookmarks_data.html:7 +#: kallithea/templates/branches/branches.html:49 +#: kallithea/templates/branches/branches_data.html:7 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 +#: kallithea/templates/tags/tags_data.html:7 +msgid "Name" +msgstr "" + +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:143 -msgid "No repositories found." -msgstr "" - #: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 -msgid "Data error." +#: kallithea/templates/admin/my_account/my_account_repos.html:57 +#: kallithea/templates/admin/my_account/my_account_watched.html:57 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 +msgid "Click to sort ascending" msgstr "" #: kallithea/templates/index_base.html:145 +#: kallithea/templates/admin/my_account/my_account_repos.html:58 +#: kallithea/templates/admin/my_account/my_account_watched.html:58 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/index_base.html:146 +msgid "No repositories found." +msgstr "" + +#: kallithea/templates/index_base.html:147 +#: kallithea/templates/admin/my_account/my_account_repos.html:60 +#: kallithea/templates/admin/my_account/my_account_watched.html:60 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 +msgid "Data error." +msgstr "" + +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 -#: kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "" -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "" @@ -2128,78 +2241,82 @@ msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, python-format +msgid "Reset Your Password to %s" +msgstr "" + +#: kallithea/templates/password_reset.html:14 +msgid "Reset Your Password" +msgstr "" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" -msgstr "" - -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/password_reset.html:46 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +msgid "" +"Password reset link will be sent to the email address matching your " +"username." +msgstr "" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "" @@ -2218,38 +2335,38 @@ msgstr "" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +msgid "Admin Journal" +msgstr "" + +#: kallithea/templates/admin/admin.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -msgid "journal filter..." -msgstr "" - -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" -msgstr "" - -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "" msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "" @@ -2259,11 +2376,11 @@ msgstr "" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2280,160 +2397,160 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:25 +msgid "Repository Defaults" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2441,75 +2558,69 @@ msgid "never" msgstr "" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2517,118 +2628,113 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +msgid "My Permissions" msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2699,7 +2805,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2720,7 +2825,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2729,7 +2834,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" +msgid "Change Your Account Password" msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:7 @@ -2745,115 +2850,74 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:11 -msgid "Avatars are disabled" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:13 -msgid "Missing email, please update your user email address." +#: kallithea/templates/admin/users/user_edit_profile.html:9 +msgid "Using" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/users/user_edit_profile.html:11 +msgid "Avatars are disabled" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:15 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be managed " -"here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" +"Your user is in an external Source of Record; some details cannot be " +"managed here" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" +msgid "Repositories You Own" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" +msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +msgid "Mark All Read" msgstr "" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2861,38 +2925,38 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:11 +msgid "Show Notification" +msgstr "" + +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +msgid "Permissions Administration" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "" @@ -2903,15 +2967,15 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2924,7 +2988,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "" @@ -2957,8 +3021,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2978,7 +3042,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -2989,7 +3053,7 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +msgid "All IP addresses are allowed." msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -2998,69 +3062,63 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +msgid "Default User Permissions Overview" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 #, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +msgid "%s Repository Group Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "" @@ -3084,7 +3142,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "" @@ -3179,8 +3237,17 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 @@ -3188,28 +3255,20 @@ msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" +msgid "Repository Groups Administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +msgid "Number of Top-level Repositories" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:14 @@ -3217,24 +3276,24 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +msgid "Optional URL from which repository should be cloned." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/forks/fork.html:42 +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3243,7 +3302,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "" @@ -3255,162 +3314,163 @@ #: kallithea/templates/admin/repos/repo_creating.html:9 #, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +msgid "%s Creating Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" -"Repository \"%(repo_name)s\" is being created, you will be redirected when " -"this process is finished.repo_name" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:42 +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" +msgid "Remote" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:58 -msgid "Remote" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +msgid "Public Journal Visibility" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +msgid "Add to Public Journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 msgid "" -"All actions made on this repository will be accessible to everyone in public " -"journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +msgid "Unlock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +msgid "Lock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Triggering a pull locks repository by user who pulled, only the same user can " -"unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be inaccessible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +msgid "Invalidate Repository Cache" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +msgid "Confirm to invalidate repository cache." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3423,12 +3483,12 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "" @@ -3462,7 +3522,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" +msgid "Extra fields are disabled." msgstr "" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 @@ -3470,19 +3530,19 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" +msgid "Remote URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +msgid "Pull Changes from Remote Location" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +msgid "Confirm to pull changes from remote side." msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3490,7 +3550,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3500,15 +3560,16 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" " Useful for CI systems, or any other cases " -"that you need to hardcode the url into 3rd party service." +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" +#: kallithea/templates/summary/summary.html:72 +msgid "Clone URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 @@ -3529,15 +3590,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." +msgid "URL used for doing remote pulls." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" @@ -3554,47 +3610,47 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" +msgid "Reset Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +msgid "Confirm to remove current statistics." msgstr "" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" -msgstr "" - -#: kallithea/templates/admin/repos/repos.html:54 +msgid "Repositories Administration" +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:40 +msgid "Settings Administration" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3663,48 +3719,54 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +msgid "Save Settings" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:69 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "" @@ -3718,8 +3780,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in the " -"database check this option to scan obsolete data in database and remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3727,19 +3789,17 @@ msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option selected. " -"Use this to reload data and clear cache keys." +msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3756,7 +3816,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3781,11 +3841,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" +msgid "Git version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3793,7 +3853,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3801,7 +3861,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3814,8 +3874,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3835,7 +3895,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +msgid "Mercurial extensions" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3848,24 +3908,24 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" +msgid "Location of repositories" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this " -"value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3894,27 +3954,29 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following variables " -"of the URL will be replaced accordingly.\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" +"Gravatar URL allows you to use another avatar server application.\n" +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" " {email} user " "email,\n" -" {md5email} md5 hash " -"of the user email (like at gravatar.com),\n" -" {size} size of " -"the image that is expected from the server application,\n" -" {netloc} network " -"location/server host of running Kallithea server" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', " -"available vars:\n" -" {scheme} 'http' or " -"'https' sent from running Kallithea server,\n" +"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 " @@ -3925,71 +3987,72 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:64 +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -3999,19 +4062,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "" @@ -4030,7 +4088,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "" @@ -4038,23 +4096,15 @@ msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_groups.html:13 +msgid "User Groups Administration" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4062,18 +4112,19 @@ msgid "Add user" msgstr "" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "" @@ -4082,14 +4133,14 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "Default Permissions" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4101,6 +4152,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4134,8 +4186,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4147,193 +4199,183 @@ msgstr "" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" -msgstr "" - -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" +msgid "Users Administration" msgstr "" #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 +msgid "Options" +msgstr "" + #: kallithea/templates/base/base.html:158 -msgid "Options" +#: kallithea/templates/forks/forks_data.html:21 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:13 +#: kallithea/templates/branches/branches.html:56 +#: kallithea/templates/branches/branches_data.html:13 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:13 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 +msgid "Search" msgstr "" #: kallithea/templates/base/base.html:166 -#: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +msgid "Unlock" msgstr "" #: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "" - -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 -msgid "Search" -msgstr "" - -#: kallithea/templates/base/base.html:174 -msgid "Unlock" +msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:241 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:243 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:244 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:292 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:299 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4344,8 +4386,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4394,85 +4436,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" -msgstr "" - -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" -msgstr "" - -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Open New Pull Request for Selected Changesets" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +msgid "Show Selected Changeset __S" +msgstr "" + +#: kallithea/templates/base/root.html:35 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" +#: kallithea/templates/base/root.html:39 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:43 +msgid "Specify changeset" msgstr "" #: kallithea/templates/bookmarks/bookmarks.html:5 @@ -4480,26 +4521,29 @@ msgid "%s Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "" @@ -4509,7 +4553,7 @@ msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4525,304 +4569,334 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +msgid "Go to tip of repository" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +msgid "Status change from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +msgid "No title" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +msgid "Comment from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 -msgid "Commenting on line {1}." +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +msgid "Commenting on line {1}." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "" -"Use @username inside this text to send notification to this Kallithea user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +msgid "Use @username inside this text to notify another user" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +msgid "Submitting ..." +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +msgid "Use @username inside this text to send notification to another local user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +msgid "Close" msgstr "" #: kallithea/templates/changeset/changeset_range.html:5 @@ -4830,18 +4904,18 @@ msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4849,12 +4923,12 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" +#: kallithea/templates/changeset/diff_block.html:87 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:90 +msgid "Renamed" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 @@ -4865,30 +4939,53 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:85 +msgid "behind" +msgstr "" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4896,38 +4993,43 @@ msgstr[1] "" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "" @@ -4936,17 +5038,22 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 @@ -4954,11 +5061,11 @@ msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "" @@ -4966,66 +5073,50 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +#: kallithea/templates/email_templates/pull_request.html:5 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "" @@ -5035,85 +5126,81 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" -msgstr "" - -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +msgid "Commit Changes" +msgstr "" + +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 -msgid "Search File List" -msgstr "" - -#: kallithea/templates/files/files_browser.html:29 -msgid "Loading file list..." -msgstr "" - -#: kallithea/templates/files/files_browser.html:42 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:43 -msgid "Mimetype" -msgstr "" - #: kallithea/templates/files/files_browser.html:44 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:48 +msgid "Loading file list..." +msgstr "" + +#: kallithea/templates/files/files_browser.html:61 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:62 +msgid "Mimetype" +msgstr "" + +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" -msgstr "" - -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:64 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +msgid "Last Committer" msgstr "" #: kallithea/templates/files/files_delete.html:4 @@ -5121,8 +5208,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5131,32 +5218,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5201,12 +5284,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "" @@ -5227,9 +5310,9 @@ msgid "%s Followers" msgstr "" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "" @@ -5242,31 +5325,35 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5275,9 +5362,9 @@ msgid "%s Forks" msgstr "" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "" @@ -5285,131 +5372,236 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" -msgstr "" - -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal.html:56 +msgid "My Repos" +msgstr "" + +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:44 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +msgid "Pull Request Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, python-format +msgid "Latest vote: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request #%s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +msgid "Summarize the changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +msgid "There are no reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +msgid "on" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +msgid "Created by" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "Update" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +msgid "Save as New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 @@ -5417,32 +5609,42 @@ msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 @@ -5451,27 +5653,27 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" -msgstr "" - -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:16 +msgid "Search in All Repositories" +msgstr "" + +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "" +#: kallithea/templates/search/search.html:62 +msgid "Search in" +msgstr "" + #: kallithea/templates/search/search.html:65 -msgid "Search in" -msgstr "" - -#: kallithea/templates/search/search.html:68 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "" @@ -5486,67 +5688,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:389 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:390 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "" + #: kallithea/templates/summary/statistics.html:392 -msgid "commits" -msgstr "" - -#: kallithea/templates/summary/statistics.html:393 -msgid "files added" +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" +msgid "commit" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "" @@ -5555,78 +5757,78 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:111 +msgid "Download" +msgstr "" + #: kallithea/templates/summary/summary.html:115 -msgid "Download" -msgstr "" - -#: kallithea/templates/summary/summary.html:119 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" -msgstr "" - -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" -msgstr "" - -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:189 +msgid "Latest Changes" +msgstr "" + +#: kallithea/templates/summary/summary.html:191 +msgid "Quick Start" +msgstr "" + +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "" @@ -5636,6 +5838,7 @@ msgid "%s Tags" msgstr "" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" -msgstr "" +#: kallithea/templates/tags/tags.html:26 +msgid "Compare Tags" +msgstr "" +
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -12,87 +12,90 @@ msgstr "" "Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2015-01-31 02:07+0200\n" "Last-Translator: kobanari <kobanari@nifty.com>\n" "Language-Team: Japanese " "<https://hosted.weblate.org/projects/kallithea/kallithea/ja/>\n" "Language: ja\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.2-dev\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "まだチェンジセットがありません" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "すべてのブランチ" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "なし" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(閉鎖済み)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "空白を表示" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "空白を無視" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "diff コンテキストを %(num)s 行増やす" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "お探しのリビジョンはこのリポジトリにはありません" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "ステータス変更 -> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "%d 個のコメント" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません" -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "リビジョンを選択" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "ホームページ" - -#: kallithea/controllers/error.py:101 +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 msgid "The request could not be understood by the server due to malformed syntax." msgstr "形式が間違っているため、サーバーはリクエストを処理できませんでした。" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:99 msgid "Unauthorized access to resource" msgstr "リソースにアクセスする権限がありません" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:101 msgid "You don't have permission to view this page" msgstr "このページを閲覧する権限がありません" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "リソースが見つかりません" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -109,12 +112,12 @@ msgstr "%s %s フィード" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "チェンジセットが大きすぎるため、省略しました" @@ -132,214 +135,292 @@ msgid "There are no files yet. %s" msgstr "まだファイルがありません。 %s" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, fuzzy, python-format +msgid "%s at %s" +msgstr "%s と %s の間" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: kallithea/controllers/files.py:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Kallithea経由で %s を削除" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "%s ファイルの削除に成功しました" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます。" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "Kallithea経由で %s を変更" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "変更点なし" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "Kallithea経由でファイルを追加" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "内容がありません" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "ファイル名がありません" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "場所には相対パスかつ .. を含まないパスを入力してください" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "空のリポジトリ" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "チェンジセット" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "ブランチ" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "タグ" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "グループ" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "リポジトリ" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "タグ" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "ブックマーク" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "公開ジャーナル" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "ジャーナル" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "キャプチャが一致しません" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "Kallitheaへの登録を受け付けました" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "パスワードリセットのリンクを送信しました" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "パスワードをリセットに成功しました。新しいパスワードをあなたのメールアドレスに送りました" -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(閉鎖済み)" + +#: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "チェンジセット" -#: kallithea/controllers/pullrequests.py:157 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "スペシャル" -#: kallithea/controllers/pullrequests.py:158 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "相手のブランチ" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "ブックマーク" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "プルリクエストには3文字以上のタイトルが必要です" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "プルリクエスト作成中にエラーが発生しました: %s" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +#, fuzzy +msgid "No description" +msgstr "説明" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストの作成に成功しました" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +#, fuzzy +msgid "Error occurred while creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +#, fuzzy +msgid "Pull request update created" +msgstr "プルリクエストレビュアー" + +#: kallithea/controllers/pullrequests.py:503 +#, fuzzy +msgid "Pull request updated" +msgstr "%s へのプルリクエスト" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "この状態で閉じる：" - -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "拒否（rejected）または承諾（approved）以外のステータスでのプルリクエスト解決は禁止されています。" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +#, fuzzy +msgid "Closing." +msgstr "読み込み中..." #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -350,23 +431,26 @@ msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" +#, fuzzy +msgid "An error occurred during search operation." msgstr "検索を実行する際にエラーが発生しました" -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +#, fuzzy +msgid "No data ready yet" msgstr "まだデータが読み込まれていません" -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "認証設定の更新に成功しました" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "認証設定の更新中にエラーが発生しました" @@ -374,68 +458,68 @@ msgid "Default settings updated successfully" msgstr "デフォルト設定の更新に成功しました" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "デフォルト設定の更新中にエラーが発生しました" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "無期限" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" -msgstr "無期限" +msgid "5 minutes" +msgstr "5 分" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" -msgstr "5 分" +msgid "1 hour" +msgstr "1 時間" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" -msgstr "1 時間" +msgid "1 day" +msgstr "1 日" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "1 日" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "1 ヶ月" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "有効期間" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "gist の作成中にエラーが発生しました" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "gist %s を削除しました" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "変更なし" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "Gist の内容を更新しました" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "Gist データを更新しました" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "Gist %s の更新中にエラーが発生しました" @@ -444,62 +528,55 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "アカウントの更新に成功しました" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "パスワードを更新しました" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "パスワードの更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメールアドレス %s を追加しました" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "ユーザーからメールアドレスを削除しました" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "APIキーの作成に成功しました" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "APIキーのリセットに成功しました" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "APIキーの削除に成功しました" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "なし" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -515,28 +592,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "管理" @@ -558,26 +635,26 @@ msgstr "自動でアカウントをアクティベートする" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "外部アカウントを自動でアクティベートする" @@ -593,21 +670,21 @@ msgid "Global permissions updated successfully" msgstr "全般の権限の更新に成功しました" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "リポジトリグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" @@ -637,182 +714,182 @@ msgid "Error occurred during deletion of repository group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "自分自身の管理者としての権限を取り消すことはできません" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "リポジトリグループ権限を更新しました" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "権限の取消中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "リポジトリ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成しました" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "%s 個のフォークを切り離しました" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "%s 個のフォークを削除しました" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "フォークしたリポジトリが存在するため、 %s は削除できません" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "%s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "リポジトリ権限を更新しました" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "フィールドの作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "フィールドの削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "-- フォークではありません --" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:526 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: kallithea/controllers/admin/repos.py:526 +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "トークンが一致しません" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "ありません" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとする" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "リポジトリをロックしました" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "リポジトリのロックを解除しました" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "アンロック中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "アンロック" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "ロック" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "リポジトリは %s されています" -#: kallithea/controllers/admin/repos.py:618 +#: kallithea/controllers/admin/repos.py:622 msgid "Cache invalidation successful" msgstr "キャッシュの無効化に成功しました" -#: kallithea/controllers/admin/repos.py:622 +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "リモートから取得" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "VCS設定を更新しました" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません。" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, fuzzy, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" #: kallithea/controllers/admin/settings.py:270 @@ -831,23 +908,23 @@ msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:418 msgid "Updated hooks" msgstr "フックを更新しました" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" @@ -856,106 +933,114 @@ msgid "Created user group %s" msgstr "ユーザーグループ %s を作成しました" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "対象に同じ物を選ぶことはできません" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "ユーザーグループ権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "ユーザー %s を作成しました" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "このユーザーは編集できません" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "ユーザーホワイトリストにIP %s を追加しました" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "IPアドレスの保存中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "リビジョンが見つかりません" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "バイナリファイル" @@ -968,163 +1053,158 @@ msgid "No changes detected" msgstr "検出された変更はありません" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "リビジョンが見つかりません" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "比較ビュー" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "と" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "%s 以上" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "リビジョン" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "フォーク名 %s" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "プルリクエスト #%s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:771 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: kallithea/lib/helpers.py:747 +#: kallithea/lib/helpers.py:775 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:781 msgid "[downloaded] archive from repository" msgstr "リポジトリからアーカイブを[ダウンロード]" -#: kallithea/lib/helpers.py:755 +#: kallithea/lib/helpers.py:783 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:791 msgid "[created] user" msgstr "ユーザーを[作成]" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:793 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:795 msgid "[created] user group" msgstr "ユーザーグループを[作成]" -#: kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:797 msgid "[updated] user group" msgstr "ユーザーグループを[更新]" -#: kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:799 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:801 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:803 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:805 msgid "[pushed] into" msgstr "[プッシュ]" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:807 msgid "[committed via Kallithea] into repository" msgstr "リポジトリに[Kallithea経由でコミット]" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:809 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "[プル]" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "ファイルなし" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "新しいファイル" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "変更" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "削除" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "リネーム" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1134,68 +1214,98 @@ "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "%s 以内" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "%s 前" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "%s と %s の間" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "たったいま" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "リポジトリへのアクセス権限無し" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "リポジトリに読込権限でアクセス" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1205,12 +1315,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "リポジトリへのアクセス権限無し" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "リポジトリに書込権限でアクセス" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1220,162 +1330,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" -msgstr "リポジトリに読込権限でアクセス" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" +msgstr "リポジトリに管理権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" -msgstr "リポジトリに書込権限でアクセス" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" +msgstr "リポジトリグループへのアクセス権限なし" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" -msgstr "リポジトリに管理権限でアクセス" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "リポジトリグループに読込権限でアクセス" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" +msgstr "リポジトリグループに書込権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "リポジトリグループへのアクセス権限なし" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" -msgstr "リポジトリグループに読込権限でアクセス" +msgid "Repository Group admin access" +msgstr "リポジトリグループに管理権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" -msgstr "リポジトリグループに書込権限でアクセス" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" +msgstr "Kallithea 管理者" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" -msgstr "リポジトリグループに管理権限でアクセス" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "リポジトリの作成を有効にする" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" +msgstr "リポジトリの作成を有効にする" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "Kallithea 管理者" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "リポジトリの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" -msgstr "リポジトリの作成を有効にする" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "リポジトリのフォークを無効にする" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "リポジトリのフォークを有効にする" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" +msgstr "新規登録を無効にする" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "リポジトリのフォークを無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "リポジトリのフォークを有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" -msgstr "新規登録を無効にする" +msgid "Register new user with Kallithea with manual activation" +msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "Kallitheaに登録した新しいユーザーを自動でアクティベートする" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "未レビュー" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "承認" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1385,12 +1495,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "未レビュー" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "却下" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1400,52 +1510,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "承認" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "却下" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "レビュー中" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "top level" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "リポジトリグループへのアクセス権限なし" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "リポジトリグループに読込権限でアクセス" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1454,9 +1558,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" -msgstr "リポジトリグループへのアクセス権限なし" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" +msgstr "リポジトリグループに書込権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1466,23 +1570,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "リポジトリグループに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "リポジトリグループに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "リポジトリグループに管理権限でアクセス" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1490,9 +1581,20 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" -msgstr "リポジトリグループに管理権限でアクセス" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "ユーザーグループへのアクセス権限なし" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" +msgstr "ユーザーグループに読込権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1501,9 +1603,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" -msgstr "ユーザーグループへのアクセス権限なし" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" +msgstr "ユーザーグループに書込権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1512,20 +1614,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "ユーザーグループに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" -msgstr "ユーザーグループに書込権限でアクセス" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" +msgstr "ユーザーグループに管理権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1534,21 +1625,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "ユーザーグループに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "リポジトリグループの作成を無効にする" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "リポジトリグループの作成を有効にする" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1556,32 +1647,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "リポジトリグループの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "ユーザーグループの作成を無効にする" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "ユーザーグループの作成を有効にする" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "新規登録を無効にする" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1589,48 +1691,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "新規登録を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "%s 行目" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "[Mention]" @@ -1656,116 +1736,161 @@ msgid "Name must not contain only digits" msgstr "数字だけの名前は使えません" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s がチェンジセットにコメント %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s がメッセージを送信 %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s がにあなたにメンション %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s がKallitheaに登録 %(when)s" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s が新しいプルリクエストを作成 %(when)s" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s がプルリクエストにコメント %(when)s" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, fuzzy, python-format +msgid "New user %(new_username)s registered" +msgstr "ユーザー名 %(username)s は不正です" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +#, fuzzy +msgid "Closing" +msgstr "メールアドレス:" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "最新のtip" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "新規ユーザー登録" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: kallithea/model/user.py:276 -#, python-format +#: kallithea/model/user.py:261 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s" + +#: kallithea/model/user.py:268 +#, fuzzy, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s" -#: kallithea/model/user.py:304 +#: kallithea/model/user.py:275 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "パスワードリセットのリンク" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "新しいパスワード" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "新しいKallitheaパスワード:%s" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "空のリストにはできません" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "ユーザー名 \"%(username)s\" はすでに使われています" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "ユーザー名 \"%(username)s\" は許可されていません" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必要があります" -#: kallithea/model/validators.py:151 +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "入力が正しくありません" -#: kallithea/model/validators.py:158 +#: kallithea/model/validators.py:139 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:158 msgid "Invalid user group name" msgstr "不正なユーザーグループ名です" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "ユーザーグループ \"%(usergroup)s\" はすでに存在します" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1773,139 +1898,141 @@ "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" " " -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "このグループは親にできません" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "グループ \"%(group_name)s\" はすでに存在します" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "古いpasswordが間違っています" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:291 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: kallithea/model/validators.py:327 +#: kallithea/model/validators.py:308 msgid "invalid password" msgstr "不正なパスワードです" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:309 msgid "invalid user name" msgstr "不正なユーザー名です" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:310 msgid "Your account is disabled" msgstr "アカウントは無効です" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "リポジトリ %(repo)s はすでに存在します" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" +#: kallithea/model/validators.py:474 +#, fuzzy +msgid "invalid clone URL" msgstr "無効なクローンURIです" -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +#: kallithea/model/validators.py:475 +#, fuzzy +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" msgstr "無効なクローンURIです。有効な http(s)/svn+http(s) のURIを指定してください" -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "フォークは親と同じ種別の必要があります" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "このグループにリポジトリを作成する権限がありません" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "ルートにリポジトリを作成する権限がありません" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "この場所にグループを作成する権限がありません" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "不正なパスです" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 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:804 +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "リビジョン %(revs)s はすでにプルリクエストの一部かステータスが設定されています" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "有効なIPv4かIPv6のアドレスを入力してください" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "キー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字しか使えません。" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "ファイル名はディレクトリ内にすることはできません" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われています" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1916,35 +2043,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "クイックフィルタ..." #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "リポジトリ" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "リポジトリを追加" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "リポジトリグループを追加" @@ -1961,164 +2089,165 @@ msgstr "グループ名" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "説明" -#: kallithea/templates/index_base.html:126 +#: kallithea/templates/index_base.html:129 #: kallithea/templates/admin/my_account/my_account_repos.html:46 #: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 #: kallithea/templates/admin/repos/repo_add_base.html:9 #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 #: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks.html:49 #: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 +#: kallithea/templates/branches/branches.html:49 #: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 #: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "名前" -#: kallithea/templates/index_base.html:129 +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "最後の変更点" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "Tip" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "所有者" -#: kallithea/templates/index_base.html:141 +#: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "昇順で並び換え" -#: kallithea/templates/index_base.html:142 +#: kallithea/templates/index_base.html:145 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 msgid "Click to sort descending" msgstr "降順で並び替え" -#: kallithea/templates/index_base.html:143 +#: kallithea/templates/index_base.html:146 msgid "No repositories found." msgstr "リポジトリが見つかりません" -#: kallithea/templates/index_base.html:144 +#: kallithea/templates/index_base.html:147 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 msgid "Data error." msgstr "データエラー" -#: kallithea/templates/index_base.html:145 +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "読み込み中..." -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "ログイン" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "%s へログイン" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "ユーザー名" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "パスワード" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "次回から自動的にサインイン" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "サインイン" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "パスワードを忘れた?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "アカウントを持っていない?" @@ -2126,78 +2255,85 @@ msgid "Password Reset" msgstr "パスワードリセット" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" +#: kallithea/templates/password_reset.html:12 +#, fuzzy, python-format +msgid "Reset Your Password to %s" msgstr "パスワードを %s にリセットします" -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" +#: kallithea/templates/password_reset.html:14 +#, fuzzy +msgid "Reset Your Password" msgstr "パスワードをリセット" -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "メールアドレス" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "キャプチャ" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" +#: kallithea/templates/password_reset.html:46 +#, fuzzy +msgid "Send Password Reset Email" msgstr "パスワードリセットのメールを送信" -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" +#: kallithea/templates/password_reset.html:47 +#, fuzzy +msgid "" +"Password reset link will be sent to the email address matching your " +"username." msgstr "該当するメールアドレスにパスワードリセットのリンクを送信します" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "サインアップ" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "%s へサインアップ" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "パスワード再入力" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "名前" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "名字" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "メールアドレス" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "アカウントは登録後すぐに利用できます" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" -msgstr "アカウントは管理者のアクティベートを待つ必要があります" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." +msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "まだブランチがありません" @@ -2216,37 +2352,39 @@ msgstr "まだブックマークがありません" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +#, fuzzy +msgid "Admin Journal" msgstr "管理者ジャーナル" -#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/admin/admin.html:10 msgid "journal filter..." msgstr "ジャーナルフィルタ..." -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +#, fuzzy +msgid "Filter" msgstr "フィルタ" -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "%s 個のエントリ" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "アクション" @@ -2256,11 +2394,11 @@ msgstr "リポジトリ" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "日時" @@ -2277,132 +2415,133 @@ msgid "Authentication Settings" msgstr "認証設定" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "認証" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "認証プラグイン" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" -msgstr "認証プラグイン" - -#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Enabled Plugins" msgstr "有効なプラグイン" -#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/templates/admin/auth/auth_settings.html:33 msgid "" "Comma separated list of plugins. Order of plugins is also order in which " "Kallithea will try to authenticate user" msgstr "カンマ区切りのプラグインの一覧です。プラグインの並び順はKallitheaがユーザー認証を試す順番でもあります。" -#: kallithea/templates/admin/auth/auth_settings.html:37 +#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Available built-in plugins" msgstr "有効な組み込みプラグイン" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "有効" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "無効" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "プラグイン" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "保存" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "プラグイン" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" msgstr "リポジトリのデフォルト設定" -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "デフォルト設定" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "リポジトリの種別" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "非公開リポジトリ" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人でないと見つけられません" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "統計を有効にする" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "概要ページの統計ウィンドウを有効にします" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "ダウンロードを有効にする" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "概要ページのダウンロードメニューを有効にします" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "ロックを有効にする" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "リポジトリのpullのロックを有効にします" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "Gistを編集" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " @@ -2411,28 +2550,28 @@ "編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 %(here)s " "をクリックして新しいバージョンを読み込みなおしてください。" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "Gist の説明..." -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 msgid "Gist lifetime" msgstr "Gist 有効期間" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "失効" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2440,75 +2579,69 @@ msgid "never" msgstr "無し" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "plain" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Gistを更新" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "キャンセル" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, fuzzy, python-format +msgid "Private Gists for User %s" msgstr "ユーザー %s の非公開 Gists" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, fuzzy, python-format +msgid "Public Gists for User %s" msgstr "ユーザー %s の公開 Gists" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "公開 Gists" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "新しい Gist を作成" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "作成日" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "まだgistがありません" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "Gistを新規作成" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "ファイルに名前をつける..." -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "非公開 Gist を作成" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "公開 Gist を作成" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2516,118 +2649,115 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "リセット" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "Gist" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "公開 Gist" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "非公開 Gist" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "削除" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "このGistを削除してもよろしいですか？" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "編集" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "Raw形式で表示" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "作成日" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "Raw形式で表示" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "アカウント" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "アカウント" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "プロフィール" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +#, fuzzy +msgid "API Keys" +msgstr "新しいAPIキー" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" -msgstr "プロフィール" +msgid "My Emails" +msgstr "メールアドレス" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" +msgstr "リポジトリ" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" -msgstr "APIキー" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" +msgstr "ウォッチ中" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "メールアドレス" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "リポジトリ" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "ウォッチ中" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "プルリクエスト" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +#, fuzzy +msgid "My Permissions" msgstr "権限" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2698,7 +2828,6 @@ msgstr "プライマリ" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2719,7 +2848,8 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +#, fuzzy +msgid "No additional emails specified." msgstr "追加のメールアドレスはありません" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2728,7 +2858,8 @@ msgstr "新しいメールアドレス" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" +#, fuzzy +msgid "Change Your Account Password" msgstr "パスワードを変更してください" #: kallithea/templates/admin/my_account/my_account_password.html:7 @@ -2744,115 +2875,77 @@ msgid "Confirm new password" msgstr "新しいパスワードの確認" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "アバターを変更できます : " -#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/my_account/my_account_profile.html:12 #: kallithea/templates/admin/users/user_edit_profile.html:9 msgid "Using" msgstr "メールアドレス:" -#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/my_account/my_account_profile.html:14 #: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "アバターは無効です" -#: kallithea/templates/admin/my_account/my_account_profile.html:13 +#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." msgstr "メールアドレスがありません。更新してください。" -#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "現在の IP" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "ユーザーは外部の Source of Record に属しているため、ここでは詳細を管理できません" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "クローズしたプルリクエストを表示" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "あなたが作成したプルリクエスト" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "プルリクエスト #%s %s に作成" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "クローズ" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "このプルリクエストを削除してもよろしいですか？" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "まだありません" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "あなたがレビュアーとして参加しているプルリクエスト" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "プルリクエスト #%s %s によって %s に作成" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" +#, fuzzy +msgid "Repositories You Own" msgstr "あなたが所有者のリポジトリ" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "レコードが見つかりません" #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" +#, fuzzy +msgid "Repositories You are Watching" msgstr "あなたがウォッチしているリポジトリ" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "通知" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "すべて" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "コメント" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "プルリクエスト" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +#, fuzzy +msgid "Mark All Read" msgstr "すべて既読にする" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2860,38 +2953,41 @@ msgstr "まだ通知がありません" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" +#: kallithea/templates/admin/notifications/show_notification.html:11 +#, fuzzy +msgid "Show Notification" msgstr "通知を表示" -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "通知" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" +#, fuzzy +msgid "Permissions Administration" msgstr "権限管理" -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "権限設定" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "全般" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +#, fuzzy +msgid "IP Whitelist" msgstr "IPアドレスのホワイトリスト" -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "概要" @@ -2900,10 +2996,10 @@ msgstr "匿名アクセス" #: kallithea/templates/admin/permissions/permissions_globals.html:13 -#, python-format +#, fuzzy, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "ログインしなくても Kallithea にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2923,7 +3019,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "リポジトリグループ" @@ -2955,9 +3051,10 @@ msgstr "グループ書き込み権限でのリポジトリ作成" #: kallithea/templates/admin/permissions/permissions_globals.html:72 +#, fuzzy msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "リポジトリグループに書き込みパーミッションを付与すると、グループ内にリポジトリを作成できるようになります" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2977,7 +3074,8 @@ msgstr "外部認証アカウントのアクティベート" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +#, fuzzy +msgid "Default IP Whitelist for All Users" msgstr "全てのユーザーに設定されるデフォルトのIPアドレスのホワイトリスト" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -2988,7 +3086,8 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +#, fuzzy +msgid "All IP addresses are allowed." msgstr "すべてのIPアドレスが許可されています" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -2997,68 +3096,64 @@ msgstr "新しいIPアドレス" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" +#, fuzzy +msgid "Default User Permissions Overview" msgstr "デフォルトのユーザー権限の概要" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "リポジトリグループを追加" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" msgstr "リポジトリグループ" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "グループ名" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "親グループ" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "親グループのパーミッションをコピー" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, python-format -msgid "%s Repository group settings" +#, fuzzy, python-format +msgid "%s Repository Group Settings" msgstr "%s リポジトリグループ 設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "リポジトリグループ" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "子グループを追加" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "高度な設定" @@ -3082,7 +3177,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "作成日" @@ -3180,57 +3275,63 @@ " groups and repositories inside" msgstr "グループのpullのロックを有効にします。このオプションはグループに含まれる全てのグループとリポジトリに適用されます。" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Remove this group" +msgstr "このユーザーグループを削除" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "このユーザーグループを削除してもよろしいですか？: %s" + #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "%s リポジトリグループダッシュボード" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "ホーム" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "と" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" +#, fuzzy +msgid "Repository Groups Administration" msgstr "リポジトリグループ管理" -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "リポジトリグループ" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#, fuzzy +msgid "Number of Top-level Repositories" msgstr "トップレベルリポジトリ数" -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" -msgstr "リポジトリを追加" - #: kallithea/templates/admin/repos/repo_add_base.html:14 msgid "Import existing repository ?" msgstr "既存のリポジトリを import しますか？" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "クローン元" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +#, fuzzy +msgid "Optional URL from which repository should be cloned." msgstr "オプション：クローンするリポジトリのHTTP[S]のURLを指定します" #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 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:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "オプション：このリポジトリが属するグループを選択します" #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3239,7 +3340,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "ランディングリビジョン" @@ -3250,164 +3351,178 @@ msgstr "ファイルページ、ダウンロード、全文検索インデックス、READMEなどの生成に使うデフォルトのリビジョン" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" +#, fuzzy, python-format +msgid "%s Creating Repository" msgstr "%s Creating repository" -#: kallithea/templates/admin/repos/repo_creating.html:16 +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "リポジトリを作成中" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトします。" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログをチェックするか、管理者に問い合わせてください。" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" msgstr "%s リポジトリ設定" +#: kallithea/templates/admin/repos/repo_edit.html:49 +#, fuzzy +msgid "Extra Fields" +msgstr "拡張フィールド" + #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" -msgstr "拡張フィールド" +msgid "Caches" +msgstr "キャッシュ" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" -msgstr "キャッシュ" - -#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "リモート" -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "統計" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "フォーク元" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +#, fuzzy +msgid "Parent" +msgstr "親リビジョン" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "保存" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" +#, fuzzy +msgid "Manually set this repository as a fork of another from the list." msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#, fuzzy +msgid "Public Journal Visibility" msgstr "公開ジャーナルでの可視性" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "公開ジャーナルから削除する" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +#, fuzzy +msgid "Add to Public Journal" msgstr "公開ジャーナルへ追加" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 +#, fuzzy msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" +"All actions done in this repository will be visible to everyone in the " +"public journal." msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +#, fuzzy +msgid "Change Locking" msgstr "ロック" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +#, fuzzy +msgid "Confirm to unlock repository." msgstr "このリポジトリのロックを解除しますか？" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" msgstr "リポジトリのロックを解除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." msgstr "このリポジトリをロックしますか？" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "リポジトリをロック" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "リポジトリのロックを解除" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "リポジトリはロックされていません" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "リポジトリのロックを強制します。匿名アクセスが無効のときしか使えません。ユーザーがリポジトリをプルすると、そのユーザーでリポジトリをロックし、同じユーザーがプッシュするまでアンロックしません。" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" msgstr "このリポジトリを削除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#, fuzzy, 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:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "フォークの切り離し" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "フォークも削除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" -"このリポジトリはKallitheaとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n" -"完全な削除が必要な場合はファイルシステムから手動で削除してください" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +#, fuzzy +msgid "Invalidate Repository Cache" msgstr "リポジトリのキャッシュを無効化" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +#, fuzzy +msgid "Confirm to invalidate repository cache." msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#, fuzzy msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +#, fuzzy +msgid "List of Cached Values" msgstr "キャッシュしている値の一覧" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3420,12 +3535,12 @@ msgstr "キー" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "アクティブ" @@ -3459,7 +3574,8 @@ msgstr "フィールドの説明を入力してください" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" +#, fuzzy +msgid "Extra fields are disabled." msgstr "拡張フィールドは無効化されています" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 @@ -3467,19 +3583,23 @@ msgstr "非公開リポジトリ" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" +#, fuzzy +msgid "Remote URL" msgstr "リモート URL" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +#, fuzzy +msgid "Pull Changes from Remote Location" msgstr "リモートから変更を取り込む" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +#, fuzzy +msgid "Confirm to pull changes from remote side." msgstr "リモートから変更を取り込んでもよろしいですか？" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +#, fuzzy +msgid "This repository does not have a remote URL set." msgstr "このリポジトリにリモート URLは設定されていません" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3487,7 +3607,8 @@ msgstr "変更不能ID" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +#, fuzzy +msgid "What is that?" msgstr "これは何？" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3495,21 +3616,24 @@ msgstr "id を使ってURLを表現" #: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#, fuzzy msgid "" "In case this repository is renamed or moved into another group the " -"repository url changes.\n" -" Using above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" "通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリのURLが変わります。\n" "上のURLを使えば、常にリポジトリにアクセスできます。\n" "この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLをハードコードしたいときに便利です。" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" -msgstr "クローンURI" +#: kallithea/templates/summary/summary.html:72 +#, fuzzy +msgid "Clone URL" +msgstr "クローンURL" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 #: kallithea/templates/base/perms_summary.html:43 @@ -3529,15 +3653,11 @@ msgstr "新しい値" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." +#, fuzzy +msgid "URL used for doing remote pulls." msgstr "remote pull で使う http[s] url です。" -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." -msgstr "オプション：このリポジトリが属するグループを選択します" - #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します" @@ -3554,47 +3674,53 @@ msgstr "処理状況" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" +#, fuzzy +msgid "Reset Statistics" msgstr "統計情報をリセット" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +#, fuzzy +msgid "Confirm to remove current statistics." msgstr "現在の統計情報をリセットしてもよろしいですか？" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" +#, fuzzy +msgid "Repositories Administration" msgstr "リポジトリ管理" -#: kallithea/templates/admin/repos/repos.html:54 +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "状態" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" +#, fuzzy +msgid "Settings Administration" msgstr "設定管理" -#: kallithea/templates/admin/settings/settings.html:40 +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "VCS" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" +#: kallithea/templates/admin/settings/settings.html:28 +#, fuzzy +msgid "Remap and Rescan" msgstr "再マップと再スキャン" -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "表示" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "フック" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" +#: kallithea/templates/admin/settings/settings.html:33 +#, fuzzy +msgid "Full Text Search" msgstr "全文検索" -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "システム情報" @@ -3663,35 +3789,44 @@ msgstr "HTTP認証レルム" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "Google Analyticsコード" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "ReCaptcha 公開鍵" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "reCaptchaの公開鍵。" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "ReCaptcha 秘密鍵" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 +#, fuzzy msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" +"on registration." msgstr "reCaptchaの秘密鍵。この値が設定されると登録時のキャプチャが有効になります。" -#: kallithea/templates/admin/settings/settings_global.html:55 +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" msgstr "設定を保存" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +#, fuzzy +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "組み込みのMercurialフック - 編集不可" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3701,10 +3836,11 @@ msgstr "フックを使うと、リポジトリへのプッシュやプルといった特定のイベントに合わせて、何らかのアクションを実行できます。フック機能では、Pythonの関数を呼び出したり、外部アプリケーションを起動したりできます。" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" +#, fuzzy +msgid "Custom Hooks" msgstr "カスタムフック" -#: kallithea/templates/admin/settings/settings_hooks.html:69 +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "フックの削除に失敗しました" @@ -3718,29 +3854,29 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." -msgstr "リポジトリがファイルシステム上からなくなったのに、データベース上には残っている場合、このオプションを選んで、データベースから古いデータベースを検出し、削除してください。" +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." +msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "すべてのリポジトリのキャッシュを無効化する" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." -msgstr "このオプションを選ぶと、各リポジトリのキャッシュデータを抹消します。データのリロードやキャッシュキーの消去が必要なときに使ってください。" +#, fuzzy +msgid "Check this to reload data and clear cache keys for all repositories." +msgstr "すべてのリポジトリのキャッシュを無効化する" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +#, fuzzy +msgid "Install Git hooks" msgstr "GITフックをインストール" #: kallithea/templates/admin/settings/settings_mapping.html:25 +#, fuzzy msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "各リポジトリに Kallitheas の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3756,8 +3892,9 @@ msgstr "一度削除してから再度インデックスを作成" #: kallithea/templates/admin/settings/settings_search.html:15 +#, fuzzy msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea 中の全てのファイルのインデックスを再生成します。" @@ -3782,11 +3919,13 @@ msgstr "プラットフォーム" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" +#, fuzzy +msgid "Git version" msgstr "GIT バージョン" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +#, fuzzy +msgid "Git path" msgstr "GIT パス" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3794,7 +3933,8 @@ msgstr "更新情報のエンドポイント" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +#, fuzzy +msgid "Note: please make sure this server can access this URL" msgstr "ノート: サーバーがこのURLにアクセスできることを確認して下さい" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3802,7 +3942,8 @@ msgstr "更新を確認中..." #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +#, fuzzy +msgid "Python Packages" msgstr "Python パッケージ" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3814,9 +3955,10 @@ msgstr "VCSの操作にSSLを必須とする" #: kallithea/templates/admin/settings/settings_vcs.html:13 +#, fuzzy msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3836,7 +3978,8 @@ msgstr "プッシュ後にリポジトリを更新する (hg update)" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +#, fuzzy +msgid "Mercurial extensions" msgstr "Mercurialエクステンション" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3848,16 +3991,18 @@ msgstr "hgsubversionエクステンションを有効にする" #: kallithea/templates/admin/settings/settings_vcs.html:53 +#, fuzzy msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" "hgsubversion " "ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "リポジトリロケーション" +#, fuzzy +msgid "Location of repositories" +msgstr "リポジトリ総数" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" @@ -3866,9 +4011,10 @@ msgstr "アンロックする。この設定を有効にするためにはKallitheaの再起動が必要です。" #: kallithea/templates/admin/settings/settings_vcs.html:72 +#, fuzzy msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "リポジトリを保存するファイルシステムのロケーション。この値を変更した場合、サーバーの再起動とリポジトリフォルダの再スキャンが必要です。" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3896,9 +4042,10 @@ msgstr "Gravatorsを利用する" #: kallithea/templates/admin/settings/settings_visual.html:30 +#, fuzzy msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3920,9 +4067,12 @@ "{netloc} Kallithea サーバーのアドレスまたはホスト名" #: kallithea/templates/admin/settings/settings_visual.html:42 +#, fuzzy msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -3947,71 +4097,74 @@ " {repoid} リポジトリの " "ID。 clone-by-id に使います。" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "ダッシュボードの項目" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "メインページダッシュボードで1ページに表示する要素数。" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "管理ページの項目" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "アイコン" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "公開リポジトリのアイコンを表示する" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "非公開リポジトリのアイコンを表示する" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." +#: kallithea/templates/admin/settings/settings_visual.html:86 +#, fuzzy +msgid "Show public/private icons next to repository names." msgstr "リポジトリ名の横に公開/非公開アイコンを表示します。" -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "メタタグ" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "次のメタタグを変換する" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 +#, fuzzy msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "リポジトリの説明のメタタグを解析して色つきのタグに変換します。" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "ユーザーグループを追加" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" msgstr "ユーザーグループ" -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "ユーザーグループを追加" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "このユーザーグループの簡潔な説明を書いてください" @@ -4021,19 +4174,14 @@ msgid "%s user group settings" msgstr "%s ユーザーグループ設定" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "ユーザーグループ" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "デフォルトの権限" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "メンバー" @@ -4052,7 +4200,7 @@ msgid "Delete this user group" msgstr "このユーザーグループを削除" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "まだメンバーがいません" @@ -4060,23 +4208,16 @@ msgid "Chosen group members" msgstr "グループメンバーを選ぶ" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "全ての要素を削除" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "有効なメンバー" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "全ての要素を追加" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" +#, fuzzy +msgid "User Groups Administration" msgstr "ユーザーグループ管理" -#: kallithea/templates/admin/user_groups/user_groups.html:13 +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "ユーザーグループ" @@ -4084,18 +4225,19 @@ msgid "Add user" msgstr "ユーザーを追加" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "ユーザー" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "ユーザーを追加" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "パスワード再入力" @@ -4104,14 +4246,15 @@ msgid "%s user settings" msgstr "%s ユーザー設定" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +msgid "Default Permissions" +msgstr "デフォルトの権限" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "メールアドレス" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "IPアドレスのホワイトリスト" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4123,6 +4266,7 @@ msgstr "アカウントのソース" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "最終ログイン日時" @@ -4169,193 +4313,193 @@ msgstr "新しいパスワード 再入力" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" +#, fuzzy +msgid "Users Administration" msgstr "ユーザー管理" -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "ユーザー" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "名前" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" -msgstr "名字" - #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "最終ログイン日時" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" +#, fuzzy +msgid "Auth Type" msgstr "認証タイプ" -#: kallithea/templates/base/base.html:37 +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "サーバーインスタンス: %s" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "サポート" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" +#: kallithea/templates/base/base.html:122 +#, fuzzy +msgid "Create Fork" msgstr "フォークを作成" -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "要約" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "履歴" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "ファイル" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "ブランチの切り替え" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 msgid "Options" msgstr "オプション" -#: kallithea/templates/base/base.html:166 +#: kallithea/templates/base/base.html:158 #: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +#, fuzzy +msgid "Compare Fork" msgstr "フォークを比較" -#: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 +#: kallithea/templates/branches/branches.html:56 #: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 +#: kallithea/templates/tags/tags.html:56 #: kallithea/templates/tags/tags_data.html:13 msgid "Compare" msgstr "比較" -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 msgid "Search" msgstr "検索" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:166 msgid "Unlock" msgstr "アンロック" +#: kallithea/templates/base/base.html:168 +msgid "Lock" +msgstr "ロック" + #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "ロック" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "フォロー" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "アンフォロー" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "フォーク" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "%s のプルリクエストを表示" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "ログインしていません" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "ログイン" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "パスワードを忘れた?" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "ログアウト" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "最近の活動を表示" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "ジャーナル" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "公開ジャーナル" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "公開 gists を表示" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "新しい gist を作成" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" +#: kallithea/templates/base/base.html:241 +#, fuzzy +msgid "All Public Gists" msgstr "すべての公開 gists" -#: kallithea/templates/base/base.html:330 -msgid "My public gists" +#: kallithea/templates/base/base.html:243 +#, fuzzy +msgid "My Public Gists" msgstr "公開 gists" -#: kallithea/templates/base/base.html:331 -msgid "My private gists" +#: kallithea/templates/base/base.html:244 +#, fuzzy +msgid "My Private Gists" msgstr "非公開 gists" -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "リポジトリから検索" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#, fuzzy +msgid "My Pull Requests" +msgstr "プルリクエスト" + +#: kallithea/templates/base/base.html:292 +#, fuzzy +msgid "Not Logged In" +msgstr "ログインしていません" + +#: kallithea/templates/base/base.html:299 +#, fuzzy +msgid "Login to Your Account" +msgstr "ログイン" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "パスワードを忘れた?" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "ログアウト" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "一致するものが見つかりません" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "キーボードショートカット" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "サイト全体" @@ -4418,85 +4562,93 @@ msgid "No permission defined" msgstr "権限が設定されていません" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" msgstr "別のコメントを追加" -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "グループ" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "メンバー" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "読み込み中..." -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "読み込み中..." -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "検索結果は省略されています" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "マッチするファイルはありません" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +#, fuzzy +msgid "Open New Pull Request" msgstr "新しいプルリクエストを作成" -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" +#: kallithea/templates/base/root.html:32 +#, fuzzy +msgid "Open New Pull Request for Selected Changesets" msgstr "選択したチェンジセットから新しいプルリクエストを作成" -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" +#: kallithea/templates/base/root.html:33 +#, fuzzy +msgid "Show Selected Changesets __S → __E" msgstr "選択した変更 __S -> __E を表示" -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" +#: kallithea/templates/base/root.html:34 +#, fuzzy +msgid "Show Selected Changeset __S" msgstr "選択した変更 __S を表示" -#: kallithea/templates/base/root.html:58 -msgid "Selection link" +#: kallithea/templates/base/root.html:35 +#, fuzzy +msgid "Selection Link" msgstr "セレクション・リンク" -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +#, fuzzy +msgid "Collapse Diff" msgstr "差分をたたむ" -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" +#: kallithea/templates/base/root.html:37 +#, fuzzy +msgid "Expand Diff" msgstr "差分を表示" -#: kallithea/templates/base/root.html:61 +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "権限の取消に失敗しました" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/base/root.html:39 +#, fuzzy +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "権限 {0}: {1} を取り消してもよろしいですか？" -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" +#: kallithea/templates/base/root.html:43 +#, fuzzy +msgid "Specify changeset" msgstr "チェンジセットを指定" #: kallithea/templates/bookmarks/bookmarks.html:5 @@ -4504,26 +4656,29 @@ msgid "%s Bookmarks" msgstr "%s ブックマーク" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "ブックマークを比較" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "作成者" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "リビジョン" @@ -4533,7 +4688,7 @@ msgid "%s Branches" msgstr "%s ブランチ" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "ブランチを比較" @@ -4548,27 +4703,38 @@ msgid_plural "showing %d out of %d revisions" msgstr[0] "%d / %d リビジョンを表示" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "表示" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "選択を解除" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "このリポジトリをロックしますか？" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "%s とフォークを比較" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" +#: kallithea/templates/changelog/changelog.html:62 +#, fuzzy, python-format +msgid "Compare fork with parent repo (%s)" msgstr "フォーク元(%s)とフォークを比較" -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "表示" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +#, fuzzy +msgid "Branch filter:" +msgstr "フィルタ" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" @@ -4577,291 +4743,323 @@ "チェンジセットステータス: %s\n" "関連するプルリクエスト #%s を開く" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "チェンジセットステータス: %s" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "コミットメッセージを展開" -#: kallithea/templates/changelog/changelog.html:114 +#: kallithea/templates/changelog/changelog.html:124 +#: kallithea/templates/compare/compare_cs.html:30 msgid "Changeset has comments" msgstr "チェンジセットにコメントがあります" -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "ブックマーク %s" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "タグ %s" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "ブランチ %s" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "まだ変更がありません" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "削除" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "変更" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "追加" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "%s ファイルに影響" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "コミットメッセージ" -#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 msgid "Age" msgstr "経過時間" -#: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "Refs" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "Kallithea経由で直接ファイルを追加またはアップロード" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "新しいファイルを追加" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "新しいリポジトリをプッシュ" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "存在するリポジトリをプッシュ" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s チェンジセット" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "親リビジョン" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "子リビジョン" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "チェンジセットステータス" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "diffとして差分を表示" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "パッチとして差分を表示" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "差分をダウンロード" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d 個のコメント" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "(%d インライン)" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "マージ" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +#, fuzzy +msgid "Grafted from:" +msgstr "作成日" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s ファイルに影響" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "巨大な差分の表示はすこし時間とリソースがかかる場合があります" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +#, fuzzy +msgid "Show full diff anyway" msgstr "すべての差分を表示" -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "リビジョンなし" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "プルリクエスト #%s に投票" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "チェンジセットのステータスを変更" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +#, fuzzy +msgid "No title" +msgstr "新しいファイル" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +#, fuzzy +msgid "Comment from pull request" msgstr "プルリクエスト #%s にコメント" -#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:32 msgid "Status change on changeset" msgstr "チェンジセットのステータスを変更" -#: kallithea/templates/changeset/changeset_file_comment.html:32 +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "チェンジセットにコメント" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "送信中..." - -#: kallithea/templates/changeset/changeset_file_comment.html:66 +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" +msgstr "%d 個のコメント" + +#: kallithea/templates/changeset/changeset_file_comment.html:67 msgid "Commenting on line {1}." msgstr "{1} 行目にコメント" -#: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +#, fuzzy +msgid "Use @username inside this text to notify another user" msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します" -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" -msgstr "プレビュー" - #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "コメントのプレビュー" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +#, fuzzy +msgid "Submitting ..." +msgstr "送信中..." + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "コメント" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "プレビュー" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "コメントするにはログインが必要です" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "今すぐログインする" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "隠す" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d 個のコメント" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "(%d インライン)" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, fuzzy, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "一般" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +#, fuzzy +msgid "Use @username inside this text to send notification to another local user." +msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "プルリクエストステータスの投票" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" msgstr "リビジョンステータスを変更" -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "クローズ(承認もしくは却下した場合)" +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "変更点なし" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(閉鎖済み)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s チェンジセット" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "影響のあるファイル" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "このファイルのすべての差分を表示" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "このファイルの差分を並べて表示" @@ -4869,13 +5067,15 @@ msgid "Show inline comments" msgstr "インラインコメントを表示" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "このリポジトリの最新バージョンのファイルを表示" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" -msgstr "このリポジトリの初期バージョンのファイルを表示" +#: kallithea/templates/changeset/diff_block.html:87 +#, fuzzy +msgid "Deleted" +msgstr "削除" + +#: kallithea/templates/changeset/diff_block.html:90 +#, fuzzy +msgid "Renamed" +msgstr "リネーム" #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -4885,68 +5085,101 @@ msgid "Ancestor" msgstr "祖先" +#: kallithea/templates/compare/compare_cs.html:61 +#, fuzzy +msgid "Show merge diff" +msgstr "すべての差分を表示" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +#, fuzzy +msgid "Common ancestor" +msgstr "チェンジセットにコメント" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +#, fuzzy +msgid "is" +msgstr "Gist" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "%s チェンジセット" + +#: kallithea/templates/compare/compare_cs.html:85 +#, fuzzy +msgid "behind" +msgstr "再インデックス" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "%s 比較" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" msgstr "リビジョンを比較" -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "入れ替え" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "リビジョンを比較" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." +#: kallithea/templates/compare/compare_diff.html:42 +#, fuzzy +msgid "Compare revisions, branches, bookmarks, or tags." msgstr "リビジョン、ブランチ、ブックマークもしくはタグの比較を行います。" -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "%s コミットを表示" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "ファイルはありません" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "すべての差分を表示" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "Gitリポジトリ" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "公開リポジトリ" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "リポジトリを作成しています..." -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "まだチェンジセットがありません" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "%s の RSS フィードを購読" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "%s の ATOM フィードを購読" @@ -4955,29 +5188,34 @@ msgid "Creating" msgstr "作成中" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, fuzzy, python-format +msgid "Comment from %s on %s changeset %s" msgstr "%s が %s のチェンジセットにコメント" -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "チェンジセットを次に変更" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." -msgstr "Kallitheaからの通知です" +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" msgstr "こんにちは %s" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "アカウントの新しいパスワードの生成リクエストを受け取りました。" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "下のURLをクリックすることで再生成が行えます。" @@ -4985,67 +5223,52 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "新しいパスワードを生成しない場合はこのメールを無視してください。" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "ユーザ %s がリポジトリ %s で新しいプルリクエストを作成しました。変更をレビューしてください。" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "タイトル" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:5 +#, fuzzy, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%s がプルリクエスト\"%s\" にコメントしました" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, fuzzy, python-format +msgid "%s requested your review of %s pull request \"%s\"" msgstr "%s がプルリクエスト\"%s\" にコメントしました" -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "%s がプルリクエスト\"%s\" にコメントしました" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "%s がプルリクエスト\"%s\" にコメントしました" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +#, fuzzy +msgid "The comment was made with status" msgstr "プルリクエストを以下のステータスで閉じました：" -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" -msgstr "プルリクエストを以下のステータスに変更しました：" - #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "このユーザを閲覧する" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "%s へ %s 秒後にリダイレクトします" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "%s ファイルの差分を並べて表示" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "ファイル差分" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "空白を無視" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "編集モード" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "%s ファイル差分" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "%s ファイル" @@ -5055,85 +5278,84 @@ msgid "%s Files Add" msgstr "%s ファイルを追加" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "新しいファイルを追加" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "場所" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "ファイル名..." -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "または" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "アップロードファイル" -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:48 msgid "Create New File" msgstr "新しいファイルを作成" -#: kallithea/templates/files/files_add.html:58 +#: kallithea/templates/files/files_add.html:53 msgid "New file mode" msgstr "ファイルモード" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" msgstr "変更をコミット" -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "リビジョン" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "前のリビジョン" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "次のリビジョン" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "このブランチで追跡" -#: kallithea/templates/files/files_browser.html:25 +#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "ファイル一覧を検索" -#: kallithea/templates/files/files_browser.html:29 +#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "ファイル一覧を読み込み中..." -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "サイズ" -#: kallithea/templates/files/files_browser.html:43 +#: kallithea/templates/files/files_browser.html:62 msgid "Mimetype" msgstr "Mimetype" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "最後のリビジョン" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" +#: kallithea/templates/files/files_browser.html:64 +#, fuzzy +msgid "Last Modified" msgstr "最終更新日" -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:65 +#, fuzzy +msgid "Last Committer" msgstr "最後の作成者" #: kallithea/templates/files/files_delete.html:4 @@ -5141,8 +5363,8 @@ msgid "%s Files Delete" msgstr "%s のファイルを削除" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "ファイルを削除" @@ -5151,32 +5373,28 @@ msgid "%s File Edit" msgstr "%s のファイルを編集" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "ファイルを編集" -#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_edit.html:48 #: kallithea/templates/files/files_source.html:32 msgid "Show Annotation" msgstr "アノテーションを表示" -#: kallithea/templates/files/files_edit.html:55 +#: kallithea/templates/files/files_edit.html:50 #: kallithea/templates/files/files_source.html:35 msgid "Download as Raw" msgstr "Raw形式でダウンロード" -#: kallithea/templates/files/files_edit.html:58 +#: kallithea/templates/files/files_edit.html:53 msgid "Source" msgstr "ソース" -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_edit.html:58 msgid "Editing file" msgstr "ファイルを編集" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "コミットメッセージ" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5220,12 +5438,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "ファイルの削除はブランチのヘッドリビジョンでのみ行えます" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "バイナリファイル (%s)" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "表示するには大きすぎるファイルです" @@ -5246,9 +5464,9 @@ msgid "%s Followers" msgstr "%s フォロワー" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "フォロワー" @@ -5261,31 +5479,36 @@ msgid "Fork repository %s" msgstr "リポジトリ %s をフォーク" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "フォーク名" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +#, fuzzy +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "非公開" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "権限のコピー" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "フォーク元リポジトリから権限をコピーします" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "クローン後にupdateする" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "クローンした後にソースをチェックアウトします" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "このリポジトリをフォーク" @@ -5294,9 +5517,9 @@ msgid "%s Forks" msgstr "%s フォーク" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "フォーク" @@ -5304,192 +5527,324 @@ msgid "Forked" msgstr "フォークしました" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "まだフォークがありません" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "ATOM ジャーナルフィード" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "RSS ジャーナルフィード" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" msgstr "リポジトリ" -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "まだエントリがありません" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "公開ジャーナル" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "ATOM 公開ジャーナルフィード" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "RSS 公開ジャーナルフィード" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" +#, fuzzy +msgid "New Pull Request" msgstr "新しいプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest.html:44 +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "タイトル" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "このプルリクエストの簡潔な説明を書いてください" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "変更の流れ" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "元のリポジトリ" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "プルリクエストを作成" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "プルリクエストレビュアー" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "所有者" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "このプルリクエストにレビュアーを追加" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "比較ビュー詳細" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "相手のリポジトリ" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +#, fuzzy +msgid "Pull Request Reviewers" +msgstr "プルリクエストレビュアー" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +#, fuzzy +msgid "No entries" +msgstr "まだエントリがありません" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, fuzzy, python-format +msgid "Latest vote: %s" +msgstr "最新のtip" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +#, fuzzy +msgid "Delete Pull Request" +msgstr "新しいプルリクエスト" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "このプルリクエストを削除してもよろしいですか？" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "クローズ" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "%s プルリクエスト #%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "レビューステータス" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, fuzzy, python-format +msgid "Pull request #%s from %s#%s" +msgstr "%s からのプルリクエスト" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#, fuzzy +msgid "Summarize the changes" +msgstr "変更をコミット" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "投票からプルリクエストのステータスを計算" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "未レビュー" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d 人のレビュアー" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "プルリクエストはすべてのレビュアーにレビューされました" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "まだブランチがありません" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#, fuzzy +msgid "on" +msgstr "なし" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "変更を取得:" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +#, fuzzy +msgid "Created by" +msgstr "作成日" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +msgid "Update" +msgstr "ユーザーを[更新]" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "所有者" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "レビュアー" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "このプルリクエストにレビュアーを追加/削除" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "レビュアー" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "コメントのプレビュー" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "変更を保存" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" -msgstr "比較ビュー" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +#, fuzzy +msgid "Save as New Pull Request" +msgstr "新しいプルリクエストを作成" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "最近の変更点" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +#, fuzzy +msgid "Pull Request Content" +msgstr "プルリクエストを以下のステータスに変更しました：" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" msgstr "%s プルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, fuzzy, python-format +msgid "Pull Requests from %s'" msgstr "%s からのプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, fuzzy, python-format +msgid "Pull Requests to '%s'" msgstr "%s へのプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, fuzzy, python-format +msgid "Show Pull Requests to %s" msgstr "%s へのプルリクエストを表示" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, fuzzy, python-format +msgid "Show Pull Requests from '%s'" msgstr "%s からのプルリクエストを表示" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "クローズしたプルリクエストを隠す" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +#, fuzzy +msgid "Show closed pull requests (in addition to open pull requests)" msgstr "クローズしたプルリクエストも表示" +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#, fuzzy +msgid "Pull Requests Created by Me" +msgstr "プルリクエストレビュアー" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#, fuzzy +msgid "Pull Requests I Participate In" +msgstr "あなたがレビュアーとして参加しているプルリクエスト" + #: kallithea/templates/search/search.html:6 #, python-format msgid "%s Search" msgstr "%s 検索" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" +#: kallithea/templates/search/search.html:16 +#, fuzzy +msgid "Search in All Repositories" msgstr "全てのリポジトリから検索" -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "検索キーワード" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "検索対象" -#: kallithea/templates/search/search.html:68 +#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "ファイルの内容" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "コミットメッセージ" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "ファイル名" @@ -5504,67 +5859,67 @@ msgid "%s Statistics" msgstr "%s 統計情報" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM フィード" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "%s RSS フィード" -#: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 msgid "Enable" msgstr "有効にする" -#: kallithea/templates/summary/statistics.html:42 +#: kallithea/templates/summary/statistics.html:39 msgid "Stats gathered: " msgstr "収集した統計情報: " -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "ファイル" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "もっと表示" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:389 msgid "commits" msgstr "コミット" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:390 msgid "files added" msgstr "追加されたファイル" +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "変更されたファイル" + +#: kallithea/templates/summary/statistics.html:392 +msgid "files removed" +msgstr "削除されたファイル" + #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" -msgstr "変更されたファイル" +msgid "commit" +msgstr "コミット" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" -msgstr "削除されたファイル" +msgid "file added" +msgstr "追加されたファイル" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" +msgstr "変更されたファイル" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "コミット" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "追加されたファイル" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "変更されたファイル" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "削除されたファイル" @@ -5573,78 +5928,80 @@ msgid "%s Summary" msgstr "%s 要約" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "リポジトリは %s によってロックされました" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "リポジトリはロックされていません" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "クローンURL" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "フォーク元" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "名前で表示" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "IDで表示" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "トレンドファイル" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:111 msgid "Download" msgstr "ダウンロード" -#: kallithea/templates/summary/summary.html:119 +#: kallithea/templates/summary/summary.html:115 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "ZIPでダウンロード" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "サブリポジトリを含める" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "リポジトリサイズ" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "フィード" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" msgstr "最近の変更点" -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" +#: kallithea/templates/summary/summary.html:191 +#, fuzzy +msgid "Quick Start" msgstr "クイックスタート" -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "リビジョン %s:%s の README ファイル" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "%s を %s でダウンロード" @@ -5654,6 +6011,8 @@ msgid "%s Tags" msgstr "%s タグ" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" +#: kallithea/templates/tags/tags.html:26 +#, fuzzy +msgid "Compare Tags" msgstr "タグを比較" +
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -1,13 +1,13 @@ -# Translations template for Kallithea. +# Dutch (Belgium) translations for Kallithea. # Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. # Automatically generated, 2014. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 0.1\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2015-03-31 16:25+0200\n" "Last-Translator: Sam Jaques <sam.jaques@me.com>\n" "Language-Team: Dutch (Belgium) " @@ -17,84 +17,83 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 2.3-dev\n" -"Generated-By: Babel 0.9.6\n" -"Language: nl_BE\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "Er zijn nog geen changesets" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "Alle aftakkingen" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(gesloten)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "Toon witruimtes" -#: kallithea/controllers/changeset.py:94 -#: kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 #, fuzzy msgid "Ignore whitespace" msgstr "Negeer witruimtes" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, fuzzy, python-format msgid "increase diff context to %(num)s lines" msgstr "vergroot de diff context met %(num)s lijnen" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "Deze revisie bestaat niet in deze repository" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "Statuswijziging -> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "" + +#: kallithea/controllers/changeset.py:382 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" +"Changing status on a changeset associated with a closed pull request is " +"not allowed" msgstr "" "Het is niet toegestaan de status te wijzigen van een changeset die " "geassocieerd is met een gesloten pull request" -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "Selecteer de changeset" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "Startpagina" +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:99 +msgid "Unauthorized access to resource" +msgstr "" #: kallithea/controllers/error.py:101 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:104 -msgid "Unauthorized access to resource" -msgstr "" - -#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -111,12 +110,12 @@ msgstr "" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "" @@ -134,215 +133,286 @@ msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, python-format +msgid "%s at %s" +msgstr "" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:461 -msgid "No content" -msgstr "" - #: kallithea/controllers/files.py:465 +msgid "No content" +msgstr "" + +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:535 -#, python-format -msgid "Unknown revision %s" -msgstr "" - -#: kallithea/controllers/files.py:537 -msgid "Empty repository" -msgstr "" - #: kallithea/controllers/files.py:539 +#, python-format +msgid "Unknown revision %s" +msgstr "" + +#: kallithea/controllers/files.py:541 +msgid "Empty repository" +msgstr "" + +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:776 -#: kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:777 -#: kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" -"Your password reset was successful, new password has been sent to your email" -msgstr "" - -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" -msgstr "" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" + +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(gesloten)" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +msgid "Pull request update created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:503 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "" - -#: kallithea/controllers/pullrequests.py:522 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +msgid "Closing." msgstr "" #: kallithea/controllers/search.py:135 @@ -354,23 +424,24 @@ msgstr "" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" -msgstr "" - -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" -msgstr "" - -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +msgid "An error occurred during search operation." +msgstr "" + +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +msgid "No data ready yet" +msgstr "" + +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" @@ -378,68 +449,68 @@ msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -448,62 +519,55 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -519,28 +583,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "" @@ -562,26 +626,26 @@ msgstr "" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "" @@ -597,21 +661,21 @@ msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "" @@ -641,182 +705,182 @@ msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 -msgid "Updated repository visibility in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:526 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:618 -msgid "Cache invalidation successful" -msgstr "" - #: kallithea/controllers/admin/repos.py:622 +msgid "Cache invalidation successful" +msgstr "" + +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" #: kallithea/controllers/admin/settings.py:270 @@ -835,23 +899,23 @@ msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:414 -msgid "Updated hooks" -msgstr "" - #: kallithea/controllers/admin/settings.py:418 +msgid "Updated hooks" +msgstr "" + +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "" @@ -860,351 +924,383 @@ msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" #: kallithea/lib/diffs.py:82 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "" -#: kallithea/lib/helpers.py:743 -msgid "[deleted] repository" -msgstr "" - -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 -msgid "[created] repository" -msgstr "" - -#: kallithea/lib/helpers.py:747 -msgid "[created] repository as fork" -msgstr "" - -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 -msgid "[forked] repository" -msgstr "" - -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 -msgid "[updated] repository" -msgstr "" - -#: kallithea/lib/helpers.py:753 -msgid "[downloaded] archive from repository" -msgstr "" - -#: kallithea/lib/helpers.py:755 -msgid "[delete] repository" -msgstr "" - -#: kallithea/lib/helpers.py:763 -msgid "[created] user" -msgstr "" - -#: kallithea/lib/helpers.py:765 -msgid "[updated] user" -msgstr "" - -#: kallithea/lib/helpers.py:767 -msgid "[created] user group" -msgstr "" - -#: kallithea/lib/helpers.py:769 -msgid "[updated] user group" -msgstr "" - #: kallithea/lib/helpers.py:771 -msgid "[commented] on revision in repository" -msgstr "" - -#: kallithea/lib/helpers.py:773 -msgid "[commented] on pull request for" +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 +msgid "[created] repository" msgstr "" #: kallithea/lib/helpers.py:775 -msgid "[closed] pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:777 -msgid "[pushed] into" -msgstr "" - -#: kallithea/lib/helpers.py:779 -msgid "[committed via Kallithea] into repository" +msgid "[created] repository as fork" +msgstr "" + +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 +msgid "[forked] repository" +msgstr "" + +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 +msgid "[updated] repository" msgstr "" #: kallithea/lib/helpers.py:781 -msgid "[pulled from remote] into repository" +msgid "[downloaded] archive from repository" msgstr "" #: kallithea/lib/helpers.py:783 +msgid "[delete] repository" +msgstr "" + +#: kallithea/lib/helpers.py:791 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:793 +msgid "[updated] user" +msgstr "" + +#: kallithea/lib/helpers.py:795 +msgid "[created] user group" +msgstr "" + +#: kallithea/lib/helpers.py:797 +msgid "[updated] user group" +msgstr "" + +#: kallithea/lib/helpers.py:799 +msgid "[commented] on revision in repository" +msgstr "" + +#: kallithea/lib/helpers.py:801 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:803 +msgid "[closed] pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:805 +msgid "[pushed] into" +msgstr "" + +#: kallithea/lib/helpers.py:807 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:809 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, 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:415 +"%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:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1214,12 +1310,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1229,162 +1325,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" +msgid "Repository Group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" +msgid "Register new user with Kallithea with manual activation" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1394,12 +1490,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1409,52 +1505,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1463,8 +1553,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1475,23 +1565,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1499,8 +1576,19 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1510,8 +1598,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1521,19 +1609,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1543,21 +1620,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1565,32 +1642,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1598,49 +1686,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:77 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "" @@ -1666,254 +1731,298 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +msgid "Closing" +msgstr "" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:276 +#: kallithea/model/user.py:261 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:268 +#, 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:275 #, 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:304 +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:151 +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:139 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:158 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:177 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" +#: kallithea/model/validators.py:291 +msgid "Passwords do not match" +msgstr "" + +#: kallithea/model/validators.py:308 +msgid "invalid password" +msgstr "" + +#: kallithea/model/validators.py:309 +msgid "invalid user name" +msgstr "" + #: kallithea/model/validators.py:310 -msgid "Passwords do not match" -msgstr "" - -#: kallithea/model/validators.py:327 -msgid "invalid password" -msgstr "" - -#: kallithea/model/validators.py:328 -msgid "invalid user name" -msgstr "" - -#: kallithea/model/validators.py:329 msgid "Your account is disabled" msgstr "" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" -msgstr "" - -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" - -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:474 +msgid "invalid clone URL" +msgstr "" + +#: kallithea/model/validators.py:475 +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +msgstr "" + +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 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:804 +"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:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1924,35 +2033,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "" #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -1969,165 +2079,165 @@ msgstr "" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:126 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - #: kallithea/templates/index_base.html:129 +#: kallithea/templates/admin/my_account/my_account_repos.html:46 +#: kallithea/templates/admin/my_account/my_account_watched.html:46 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 +#: kallithea/templates/admin/repos/repo_add_base.html:9 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 +#: kallithea/templates/base/perms_summary.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:49 +#: kallithea/templates/bookmarks/bookmarks_data.html:7 +#: kallithea/templates/branches/branches.html:49 +#: kallithea/templates/branches/branches_data.html:7 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 +#: kallithea/templates/tags/tags_data.html:7 +msgid "Name" +msgstr "" + +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:143 -msgid "No repositories found." -msgstr "" - #: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 -msgid "Data error." +#: kallithea/templates/admin/my_account/my_account_repos.html:57 +#: kallithea/templates/admin/my_account/my_account_watched.html:57 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 +msgid "Click to sort ascending" msgstr "" #: kallithea/templates/index_base.html:145 +#: kallithea/templates/admin/my_account/my_account_repos.html:58 +#: kallithea/templates/admin/my_account/my_account_watched.html:58 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/index_base.html:146 +msgid "No repositories found." +msgstr "" + +#: kallithea/templates/index_base.html:147 +#: kallithea/templates/admin/my_account/my_account_repos.html:60 +#: kallithea/templates/admin/my_account/my_account_watched.html:60 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 +msgid "Data error." +msgstr "" + +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 -#: kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "" -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "" @@ -2135,78 +2245,82 @@ msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, python-format +msgid "Reset Your Password to %s" +msgstr "" + +#: kallithea/templates/password_reset.html:14 +msgid "Reset Your Password" +msgstr "" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" -msgstr "" - -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/password_reset.html:46 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +msgid "" +"Password reset link will be sent to the email address matching your " +"username." +msgstr "" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "" @@ -2225,38 +2339,38 @@ msgstr "" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +msgid "Admin Journal" +msgstr "" + +#: kallithea/templates/admin/admin.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -msgid "journal filter..." -msgstr "" - -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" -msgstr "" - -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "" msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "" @@ -2266,11 +2380,11 @@ msgstr "" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2287,160 +2401,160 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:25 +msgid "Repository Defaults" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2448,75 +2562,69 @@ msgid "never" msgstr "" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2524,118 +2632,113 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +msgid "My Permissions" msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2706,7 +2809,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2727,7 +2829,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2736,7 +2838,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" +msgid "Change Your Account Password" msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:7 @@ -2752,115 +2854,74 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:11 -msgid "Avatars are disabled" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:13 -msgid "Missing email, please update your user email address." +#: kallithea/templates/admin/users/user_edit_profile.html:9 +msgid "Using" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/users/user_edit_profile.html:11 +msgid "Avatars are disabled" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:15 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be managed " -"here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" +"Your user is in an external Source of Record; some details cannot be " +"managed here" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" +msgid "Repositories You Own" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" +msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +msgid "Mark All Read" msgstr "" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2868,38 +2929,38 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:11 +msgid "Show Notification" +msgstr "" + +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +msgid "Permissions Administration" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "" @@ -2910,15 +2971,15 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2931,7 +2992,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "" @@ -2964,8 +3025,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2985,7 +3046,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -2996,7 +3057,7 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +msgid "All IP addresses are allowed." msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -3005,69 +3066,63 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +msgid "Default User Permissions Overview" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 #, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +msgid "%s Repository Group Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "" @@ -3091,7 +3146,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "" @@ -3186,8 +3241,17 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 @@ -3195,28 +3259,20 @@ msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" +msgid "Repository Groups Administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +msgid "Number of Top-level Repositories" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:14 @@ -3224,24 +3280,24 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +msgid "Optional URL from which repository should be cloned." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/forks/fork.html:42 +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3250,7 +3306,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "" @@ -3262,162 +3318,163 @@ #: kallithea/templates/admin/repos/repo_creating.html:9 #, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +msgid "%s Creating Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" -"Repository \"%(repo_name)s\" is being created, you will be redirected when " -"this process is finished.repo_name" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:42 +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" +msgid "Remote" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:58 -msgid "Remote" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +msgid "Public Journal Visibility" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +msgid "Add to Public Journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 msgid "" -"All actions made on this repository will be accessible to everyone in public " -"journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +msgid "Unlock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +msgid "Lock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Triggering a pull locks repository by user who pulled, only the same user " -"can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be inaccessible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +msgid "Invalidate Repository Cache" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +msgid "Confirm to invalidate repository cache." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3430,12 +3487,12 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "" @@ -3469,7 +3526,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" +msgid "Extra fields are disabled." msgstr "" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 @@ -3477,19 +3534,19 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" +msgid "Remote URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +msgid "Pull Changes from Remote Location" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +msgid "Confirm to pull changes from remote side." msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3497,7 +3554,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3507,15 +3564,16 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" " Useful for CI systems, or any other cases " -"that you need to hardcode the url into 3rd party service." +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" +#: kallithea/templates/summary/summary.html:72 +msgid "Clone URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 @@ -3536,15 +3594,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." +msgid "URL used for doing remote pulls." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" @@ -3561,47 +3614,47 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" +msgid "Reset Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +msgid "Confirm to remove current statistics." msgstr "" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" -msgstr "" - -#: kallithea/templates/admin/repos/repos.html:54 +msgid "Repositories Administration" +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:40 +msgid "Settings Administration" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3670,48 +3723,54 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +msgid "Save Settings" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:69 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "" @@ -3725,8 +3784,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in the " -"database check this option to scan obsolete data in database and remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3734,19 +3793,17 @@ msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option selected. " -"Use this to reload data and clear cache keys." +msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3763,7 +3820,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3788,11 +3845,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" +msgid "Git version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3800,7 +3857,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3808,7 +3865,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3821,8 +3878,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3842,7 +3899,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +msgid "Mercurial extensions" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3855,24 +3912,24 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" +msgid "Location of repositories" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this " -"value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3901,27 +3958,29 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following variables " -"of the URL will be replaced accordingly.\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" +"Gravatar URL allows you to use another avatar server application.\n" +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" " {email} user " "email,\n" -" {md5email} md5 hash " -"of the user email (like at gravatar.com),\n" -" {size} size of " -"the image that is expected from the server application,\n" -" {netloc} network " -"location/server host of running Kallithea server" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', " -"available vars:\n" -" {scheme} 'http' or " -"'https' sent from running Kallithea server,\n" +"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 " @@ -3932,71 +3991,72 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:64 +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -4006,19 +4066,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "" @@ -4037,7 +4092,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "" @@ -4045,23 +4100,15 @@ msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_groups.html:13 +msgid "User Groups Administration" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4069,18 +4116,19 @@ msgid "Add user" msgstr "" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "" @@ -4089,14 +4137,14 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "Default Permissions" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4108,6 +4156,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4141,8 +4190,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4154,193 +4203,183 @@ msgstr "" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" -msgstr "" - -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" +msgid "Users Administration" msgstr "" #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 +msgid "Options" +msgstr "" + #: kallithea/templates/base/base.html:158 -msgid "Options" +#: kallithea/templates/forks/forks_data.html:21 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:13 +#: kallithea/templates/branches/branches.html:56 +#: kallithea/templates/branches/branches_data.html:13 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:13 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 +msgid "Search" msgstr "" #: kallithea/templates/base/base.html:166 -#: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +msgid "Unlock" msgstr "" #: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "" - -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 -msgid "Search" -msgstr "" - -#: kallithea/templates/base/base.html:174 -msgid "Unlock" +msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:241 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:243 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:244 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:292 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:299 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4351,8 +4390,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4401,112 +4440,116 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" -msgstr "" - -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" -msgstr "" - -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Open New Pull Request for Selected Changesets" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +#, fuzzy +msgid "Show Selected Changeset __S" +msgstr "Selecteer de changeset" + +#: kallithea/templates/base/root.html:35 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" -msgstr "" +#: kallithea/templates/base/root.html:39 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#, fuzzy +msgid "Specify changeset" +msgstr "Selecteer de changeset" #: kallithea/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "" @@ -4516,7 +4559,7 @@ msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4532,323 +4575,356 @@ msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +msgid "Go to tip of repository" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "Statuswijziging -> %s" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +msgid "No title" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +msgid "Comment from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 -msgid "Commenting on line {1}." +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +msgid "Commenting on line {1}." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "" -"Use @username inside this text to send notification to this Kallithea user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +msgid "Use @username inside this text to notify another user" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +msgid "Submitting ..." +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +msgid "Use @username inside this text to send notification to another local user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" +msgstr "Selecteer de changeset" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(gesloten)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4856,12 +4932,12 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" +#: kallithea/templates/changeset/diff_block.html:87 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:90 +msgid "Renamed" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 @@ -4872,30 +4948,53 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "Selecteer de changeset" + +#: kallithea/templates/compare/compare_cs.html:85 +msgid "behind" +msgstr "" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4903,38 +5002,43 @@ msgstr[1] "" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "" @@ -4943,17 +5047,22 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 @@ -4961,11 +5070,11 @@ msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "" @@ -4973,66 +5082,50 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +#: kallithea/templates/email_templates/pull_request.html:5 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "" @@ -5042,85 +5135,82 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" -msgstr "" - -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" +msgstr "Selecteer de changeset" + +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 -msgid "Search File List" -msgstr "" - -#: kallithea/templates/files/files_browser.html:29 -msgid "Loading file list..." -msgstr "" - -#: kallithea/templates/files/files_browser.html:42 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:43 -msgid "Mimetype" -msgstr "" - #: kallithea/templates/files/files_browser.html:44 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:48 +msgid "Loading file list..." +msgstr "" + +#: kallithea/templates/files/files_browser.html:61 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:62 +msgid "Mimetype" +msgstr "" + +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" -msgstr "" - -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:64 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +msgid "Last Committer" msgstr "" #: kallithea/templates/files/files_delete.html:4 @@ -5128,8 +5218,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5138,32 +5228,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5208,12 +5294,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "" @@ -5234,9 +5320,9 @@ msgid "%s Followers" msgstr "" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "" @@ -5249,31 +5335,35 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5282,9 +5372,9 @@ msgid "%s Forks" msgstr "" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "" @@ -5292,131 +5382,237 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" -msgstr "" - -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal.html:56 +msgid "My Repos" +msgstr "" + +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:44 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +msgid "Pull Request Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, python-format +msgid "Latest vote: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request #%s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +msgid "Summarize the changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +msgid "There are no reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +msgid "on" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +msgid "Created by" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "Update" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +msgid "Save as New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "Selecteer de changeset" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 @@ -5424,32 +5620,42 @@ msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 @@ -5458,27 +5664,27 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" -msgstr "" - -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:16 +msgid "Search in All Repositories" +msgstr "" + +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "" +#: kallithea/templates/search/search.html:62 +msgid "Search in" +msgstr "" + #: kallithea/templates/search/search.html:65 -msgid "Search in" -msgstr "" - -#: kallithea/templates/search/search.html:68 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "" @@ -5493,67 +5699,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:389 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:390 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "" + #: kallithea/templates/summary/statistics.html:392 -msgid "commits" -msgstr "" - -#: kallithea/templates/summary/statistics.html:393 -msgid "files added" +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" +msgid "commit" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "" @@ -5562,78 +5768,79 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:111 +msgid "Download" +msgstr "" + #: kallithea/templates/summary/summary.html:115 -msgid "Download" -msgstr "" - -#: kallithea/templates/summary/summary.html:119 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" -msgstr "" - -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" -msgstr "" - -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" +msgstr "Statuswijziging -> %s" + +#: kallithea/templates/summary/summary.html:191 +msgid "Quick Start" +msgstr "" + +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "" @@ -5643,6 +5850,7 @@ msgid "%s Tags" msgstr "" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" -msgstr "" +#: kallithea/templates/tags/tags.html:26 +msgid "Compare Tags" +msgstr "" +
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2014-12-12 14:22+0200\n" "Last-Translator: Michal Čihař <michal@cihar.com>\n" "Language-Team: Polish " @@ -22,47 +22,50 @@ "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" -"X-Generator: Weblate 2.2-dev\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "Wszystkie gałęzie" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Brak" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(zamknięty)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "pokazuj spacje" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignoruj pokazywanie spacji" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "Zmiana statusu -> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "%d komentarz" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" @@ -70,33 +73,33 @@ "Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest " "niedozwolona" -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "Wybrane zmiany" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "Strona główna" - -#: kallithea/controllers/error.py:101 +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Wniosek nie może być rozumiany przez serwer z powodu zniekształconej " "składni." -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:99 msgid "Unauthorized access to resource" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:101 msgid "You don't have permission to view this page" msgstr "Nie masz uprawnień do przeglądania tej strony" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "Zasób nie został znaleziony" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -115,12 +118,12 @@ msgstr "%s %s zasilać" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "Lista zmian była zbyt duża i została ucięta..." @@ -138,216 +141,292 @@ msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, fuzzy, python-format +msgid "%s at %s" +msgstr "w %s i %s" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, 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:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 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:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "Edytowanie %s w Kallithea" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "Bez zmian" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "Dodano %s poprzez Kallithea" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "Brak treści" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "Brak nazwy pliku" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 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:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "Puste repozytorium" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "Różnice" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Gałęzie" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Etykiety" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repozytoria" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "Bookmark" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "Dziennik publiczny" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "dziennik" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "Udało Ci się zarejestrować na stronie" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "Twój link zresetowania hasła został wysłany" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(zamknięty)" + +#: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Grupy zmian" -#: kallithea/controllers/pullrequests.py:157 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Specjalne" -#: kallithea/controllers/pullrequests.py:158 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "gałęzie" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Zakładki" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +#, fuzzy +msgid "No description" +msgstr "Opis" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +#, fuzzy +msgid "Error occurred while creating pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +#, fuzzy +msgid "Pull request update created" +msgstr "Recenzje wniosków połączenia gałęzi" + +#: kallithea/controllers/pullrequests.py:503 +#, fuzzy +msgid "Pull request updated" +msgstr "Połączone gałęzie" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "Zamykanie" - -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" -"Zamknij wszystkie wnioski połączenia gałęzi innych stanów niż odrzucony, " -"zatwierdzony lub zabroniony" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +#, fuzzy +msgid "Closing." +msgstr "ładuję ..." #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -358,23 +437,26 @@ msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" +#, fuzzy +msgid "An error occurred during search operation." msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +#, fuzzy +msgid "No data ready yet" msgstr "Żadne dane nie zostały załadowane" -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "Ustawienia autentykacji poprawnie zaktualizowane" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "wystapił błąd podczas uaktualniania ustawień autentykacji" @@ -382,68 +464,68 @@ msgid "Default settings updated successfully" msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "wystąpił błąd podczas aktualizacji wartości domyślnych" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "na zawsze" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" -msgstr "na zawsze" +msgid "5 minutes" +msgstr "5 minut" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" -msgstr "5 minut" +msgid "1 hour" +msgstr "1 godzina" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" -msgstr "1 godzina" +msgid "1 day" +msgstr "1 dzień" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "1 dzień" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "1 miesiąc" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "Czas życia" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "Wystąpił błąd podczas tworzenia git" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "Usuń gist %s" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -454,62 +536,55 @@ "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, 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:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "Dodano e-mail %s do użytkownika" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "Usunięto e-mail użytkownikowi" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Brak" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -525,28 +600,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "Administracja" @@ -568,26 +643,26 @@ msgstr "Dozwolona z automatyczną aktywacją konta" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "Automatyczna aktywacja nowego konta" @@ -603,21 +678,21 @@ msgid "Global permissions updated successfully" msgstr "Globalne uprawnienia zaktualizowane poprawnie" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Wystąpił błąd podczas aktualizacji uprawnień" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, 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:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "Zaktualizowano grupę repo %s" @@ -647,182 +722,182 @@ 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:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "Nie można cofnąć zezwolenia dla admina jako admin" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "Wystąpił błąd podczas cofania zezwolenia" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "Gałęzi %s w repozytorium %s" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "Utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "Oderwane rozgałęzienie %s" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "Wystąpił błąd podczas usuwania %s" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "Uprawnienia repozytorium zostały zaktualizowane" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "-- Brak rozgalezienia --" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:526 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: kallithea/controllers/admin/repos.py:526 +#: kallithea/controllers/admin/repos.py:530 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:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "Niezgodność tokenu" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "Brak" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "Zablokowane repozytorium" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "Odblokowane repozytorium" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "Wystąpił błąd podczas odblokowywania" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "Odblokowany" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "Zablokowany" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "Repozytoriów jest %s" -#: kallithea/controllers/admin/repos.py:618 +#: kallithea/controllers/admin/repos.py:622 msgid "Cache invalidation successful" msgstr "Cache wyczyszczony poprawnie" -#: kallithea/controllers/admin/repos.py:622 +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "Aktualizacja ustawień VCS" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, fuzzy, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, " "usunięto: %s" @@ -843,23 +918,23 @@ msgid "Please enter email address" msgstr "Proszę podać adres email" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "Dodano nowy hook" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:418 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" @@ -868,106 +943,114 @@ msgid "Created user group %s" msgstr "Utworzono grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, 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:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "Zaktualizowano grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, 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:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "Grupa użytkowników została usunięta z powodzeniem" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 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:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "Aktualizacja uprawnień" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "Utworzono użytkownika %s" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "Użytkownik został zaktualizowany" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "Użytkownik został usunięty" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "Wystąpił błąd podczas usuwania użytkownika" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "Nie możesz edytować tego użytkownika" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "Dodano ip %s do listy dozwolonych adresów użytkownia" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 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:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "Nie znaleziono changeset" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Plik binarny" @@ -982,163 +1065,158 @@ msgid "No changes detected" msgstr "Nie wykryto zmian" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "Nie znaleziono changeset" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "Wyświetl porównanie" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "i" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "%s więcej" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "rewizja" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "nazwa rozgałęzienia %s" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "Połączonych gałęzi #%s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:771 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: kallithea/lib/helpers.py:747 +#: kallithea/lib/helpers.py:775 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:781 msgid "[downloaded] archive from repository" msgstr "[pobierz] archiwum z repozytorium" -#: kallithea/lib/helpers.py:755 +#: kallithea/lib/helpers.py:783 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:791 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:793 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:795 msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:797 msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:799 msgid "[commented] on revision in repository" msgstr "[komentarz] do zmiany w repozytorium" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:801 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:803 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:805 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:807 msgid "[committed via Kallithea] into repository" msgstr "[synchronizacja przez Kallithea] z repozytorium" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:809 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "[pobrano]" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr " i %s więcej" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "Brak Plików" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "nowy plik" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "modyfikuj" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "kasuj" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "zmień nazwę" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1149,7 +1227,7 @@ "zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " "ponownie przeskanować repozytoria" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1157,7 +1235,7 @@ msgstr[1] "%d lata" msgstr[2] "%d lat" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1165,7 +1243,7 @@ msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1173,7 +1251,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dni" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1181,7 +1259,7 @@ msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1189,7 +1267,7 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1197,32 +1275,62 @@ msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "w %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "%s temu" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "%s i %s temu" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "przed chwilą" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "Brak dostępu do repozytorium" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "Repozytorium do odczytu" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1232,12 +1340,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "Brak dostępu do repozytorium" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "Repozytorium do zapisu" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1247,162 +1355,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" -msgstr "Repozytorium do odczytu" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" +msgstr "Administracja dostępu do repozytorium" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" -msgstr "Repozytorium do zapisu" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" +msgstr "Grupy repozytoriów brak dostępu" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" -msgstr "Administracja dostępu do repozytorium" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" +msgid "Repository Group admin access" +msgstr "Repozytoria Grupy dostęp administratora" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" +msgstr "Administrator Repo" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" -msgstr "Repozytoria Grupy dostęp administratora" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "Tworzenie repozytorium jest wyłączone" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" +msgstr "Tworzenie repozytorium jest włączone" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "Administrator Repo" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "Tworzenie repozytorium jest wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" -msgstr "Tworzenie repozytorium jest włączone" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "Rozwidlenie repozytorium wyłączone" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "Rozwidlenie repozytorium włączone" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" +msgstr "Rejestracja wyłączona" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "Rozwidlenie repozytorium wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "Rozwidlenie repozytorium włączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" -msgstr "Rejestracja wyłączona" +msgid "Register new user with Kallithea with manual activation" +msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "Brak Korekty" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "Zaakceptowano" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1412,12 +1520,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "Brak Korekty" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "Odrzucono" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1427,52 +1535,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "Zaakceptowano" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "Odrzucono" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "Objęty Przeglądem" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "najwyższy poziom" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "Grupy repozytoriów brak dostępu" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1481,9 +1583,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" -msgstr "Grupy repozytoriów brak dostępu" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1493,23 +1595,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "Repozytoria Grupy dostęp administratora" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1517,9 +1606,20 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" -msgstr "Repozytoria Grupy dostęp administratora" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "Ta grupa użytkowników nie ma dostępu" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" +msgstr "Dostęp do grupy parametrów użytkownika" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1528,9 +1628,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" -msgstr "Ta grupa użytkowników nie ma dostępu" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" +msgstr "Ta grupa użytkowników ma prawo do zapisu" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1539,20 +1639,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "Dostęp do grupy parametrów użytkownika" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" -msgstr "Ta grupa użytkowników ma prawo do zapisu" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" +msgstr "Ta grupa użytkowników ma uprawnienia administratora" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1561,21 +1650,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "Ta grupa użytkowników ma uprawnienia administratora" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "Tworzenie grup repozytoriów wyłączone" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "Tworzenie grup repozytoriów włączone" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1583,32 +1672,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "Tworzenie grup repozytoriów włączone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "Tworzenie grup użytkowników wyłączone" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "Tworzenie grup użytkowników właczone" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "Rejestracja wyłączona" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "Rejestracja użytkownika z ręczną aktywacją konta" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1616,48 +1716,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "Rejestracja wyłączona" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "Rejestracja użytkownika z ręczną aktywacją konta" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "widziany %s" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "[Wymieniony]" @@ -1683,98 +1761,147 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s skomentował zatwierdzenie %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s wysłał wiadomość do %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s wspomniał o Tobie w %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s zarejestrował na stronie w %(when)s" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, fuzzy, python-format +msgid "New user %(new_username)s registered" +msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +#, fuzzy +msgid "Closing" +msgstr "Używa:" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "ostatni tip" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "nowy użytkownik się zarejestrował" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 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/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: kallithea/model/user.py:276 -#, python-format +#: kallithea/model/user.py:261 +#, 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:268 +#, fuzzy, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" +"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:275 +#, 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 repozytoria. %s" -#: kallithea/model/user.py:304 +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "łącze resetowania hasła" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "Nowe hasło" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "Nowe hasło do strony: %s" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "Wartość listy nie może być pusta" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Użytkownik \"%(username)s\" już istnieje" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" @@ -1783,25 +1910,25 @@ " kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub " "podkreśleniem" -#: kallithea/model/validators.py:151 +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:158 +#: kallithea/model/validators.py:139 #, python-format msgid "Username %(username)s is not valid" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:158 msgid "Invalid user group name" msgstr "Niewłaściwa nazwa grupy" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Nazwa grupy \"%(usergroup)s\" już istnieje" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1809,106 +1936,108 @@ "nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, " "kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "Nie można przypisać do tej grupy jako rodzic" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Nazwa grupy \"%(group_name)s\" już istnieje" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Repozytorium o nazwie \"%(group_name)s\" już istnieje" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "Nieprawidłowe znaki (nie-ascii) w haśle" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:291 msgid "Passwords do not match" msgstr "Hasła różnią się" -#: kallithea/model/validators.py:327 +#: kallithea/model/validators.py:308 msgid "invalid password" msgstr "nieprawidłowe hasło" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:309 msgid "invalid user name" msgstr "niepoprawna nazwa użytkownika" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:310 msgid "Your account is disabled" msgstr "Twoje konto jest wyłączone" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Nazwa repozytorium %(repo)s jest zabroniona" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Repozytorium o nazwie %(repo)s już istnieje" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, 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:378 +#: kallithea/model/validators.py:359 #, 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:493 -msgid "invalid clone url" +#: kallithea/model/validators.py:474 +#, fuzzy +msgid "invalid clone URL" msgstr "nieprawidłowe url klonowania" -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +#: kallithea/model/validators.py:475 +#, fuzzy +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" msgstr "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)" -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "Fork musi być tego samego typu, jak rodzic" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 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:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 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:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "Ten adres e-mail jest już zajęty" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "e-mail \"%(email)s\" nie istnieje." -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1916,36 +2045,36 @@ "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " "który jest odpowiednikiem \"username\"" -#: kallithea/model/validators.py:804 +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "Rewizja %(revs)s jest już częścią nowej gałęzi więc określ jego status" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "Proszę podać poprawny adres IPv4 lub IPv6" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, 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:870 +#: kallithea/model/validators.py:851 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:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "Nazwa pliku nie może znajdować się w katalogu" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1956,35 +2085,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "szybki filtr..." #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "repozytoria" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "Dodaj Repozytorium" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "Dodaj Grupę Repozytoriów" @@ -2001,164 +2131,165 @@ msgstr "Nazwa Grupy" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "Opis" -#: kallithea/templates/index_base.html:126 +#: kallithea/templates/index_base.html:129 #: kallithea/templates/admin/my_account/my_account_repos.html:46 #: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 #: kallithea/templates/admin/repos/repo_add_base.html:9 #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 #: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks.html:49 #: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 +#: kallithea/templates/branches/branches.html:49 #: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 #: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "Nazwa" -#: kallithea/templates/index_base.html:129 +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "Ostatnia akytwność" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "Ostatnia zmiana" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "Właściciel" -#: kallithea/templates/index_base.html:141 +#: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "Kliknij, aby posortować rosnąco" -#: kallithea/templates/index_base.html:142 +#: kallithea/templates/index_base.html:145 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 msgid "Click to sort descending" msgstr "Kliknij, aby posortować malejąco" -#: kallithea/templates/index_base.html:143 +#: kallithea/templates/index_base.html:146 msgid "No repositories found." msgstr "Nie znaleziono repozytorium." -#: kallithea/templates/index_base.html:144 +#: kallithea/templates/index_base.html:147 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 msgid "Data error." msgstr "Błąd danych." -#: kallithea/templates/index_base.html:145 +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "Wczytywanie..." -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "Zaloguj się" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "Zaloguj się do %s" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "Nazwa użytkownika" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "Hasło" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "Zapamiętaj mnie" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "Zaloguj się" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "Zapomniałeś hasła?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "Nie masz konta?" @@ -2166,78 +2297,85 @@ msgid "Password Reset" msgstr "Łącze resetowania hasła" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, fuzzy, python-format +msgid "Reset Your Password to %s" +msgstr "Zapomniałeś hasła?" + +#: kallithea/templates/password_reset.html:14 +#, fuzzy +msgid "Reset Your Password" +msgstr "Zapomniałeś hasła?" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "Adres Email" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" +#: kallithea/templates/password_reset.html:46 +#, fuzzy +msgid "Send Password Reset Email" +msgstr "łącze resetowania hasła" + +#: kallithea/templates/password_reset.html:47 +#, fuzzy +msgid "" +"Password reset link will be sent to the email address matching your " +"username." msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "Zarejestruj się" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "Ponownie wprowadź hasło" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "Imię" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "Nazwisko" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "Twoje konto zostanie aktywowane zaraz po rejestracji" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" -msgstr "Twoje konto musi zostać aktywowane przez administratora" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." +msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "Nie ma jeszcze gałęzi" @@ -2256,25 +2394,27 @@ msgstr "Nie ma jeszcze zakładek" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +#, fuzzy +msgid "Admin Journal" msgstr "Dziennik administratora" -#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/admin/admin.html:10 msgid "journal filter..." msgstr "szybkie wyszukiwanie..." -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +#, fuzzy +msgid "Filter" msgstr "filtr" -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "%s wejście" msgstr[1] "%s wejść" msgstr[2] "%s wejść" @@ -2282,13 +2422,13 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "Działanie" @@ -2298,11 +2438,11 @@ msgstr "Repozytorium" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Data" @@ -2319,90 +2459,91 @@ msgid "Authentication Settings" msgstr "Ustawienia Autentykacji" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "Autentykacja" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "Wtyczki Autentykacji" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" -msgstr "Wtyczki Autentykacji" - -#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Enabled Plugins" msgstr "Włączone Wtyczki" -#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/templates/admin/auth/auth_settings.html:33 msgid "" "Comma separated list of plugins. Order of plugins is also order in which " "Kallithea will try to authenticate user" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:37 +#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "Wtyczka" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "Zapisz" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "Wtyczka" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" msgstr "Repozytoria domyślne" -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "Domyślne" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "Typ" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "Prywatne repozytorium" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2410,71 +2551,71 @@ "Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych " "jako współpracownicy." -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "Włącz statystyki" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "Włącz okno statystyk na stronie podsumowania." -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "Włącz pobieranie" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "Włącz menu pobierania na stronie podsumowania." -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "Włącz blokowanie" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 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:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "Edytuj Gist" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "Opis Gist ..." -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 msgid "Gist lifetime" msgstr "Trwałość Gist" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "Wygasa" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2482,75 +2623,69 @@ msgid "never" msgstr "nigdy" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "zwykły" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Zaktualizuj Gist" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "Anuluj" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, fuzzy, python-format +msgid "Private Gists for User %s" msgstr "Prywatne Gists użytkownika %s" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, fuzzy, python-format +msgid "Public Gists for User %s" msgstr "Publiczne Gists użytkownika %s" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "Publiczne Gists" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "Utwórz Nowy Gist" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "Utworzono" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "Nie ma jeszcze żadnych gists" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "Nowy Gist" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "Utwórz Prywatny Gist" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "Utwórz Publiczny Gist" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2558,118 +2693,114 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "Zresetuj" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "Gist" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "Adres URL" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "Publiczny Gist" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "Prywatny Gist" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "Usuń" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "Potwierdź aby usunąć ten Gist" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Edycja" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "utworzono" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "wyświetl jako raw" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "Moje konto" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "Moje konto" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "Profil" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" -msgstr "Profil" +msgid "My Emails" +msgstr "Moje Emaile" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" +msgstr "Moje Repozytoria" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" -msgstr "" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" +msgstr "Obserwowane" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "Moje Emaile" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "Moje Repozytoria" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "Obserwowane" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "Połączone gałęzie" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +#, fuzzy +msgid "My Permissions" msgstr "Moje uprawnienia" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2740,7 +2871,6 @@ msgstr "Główny" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2761,7 +2891,8 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +#, fuzzy +msgid "No additional emails specified." msgstr "Brak dodatkowych emaili" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2770,8 +2901,9 @@ msgstr "Nowy adres e-mail" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" -msgstr "" +#, fuzzy +msgid "Change Your Account Password" +msgstr "Nowe hasło" #: kallithea/templates/admin/my_account/my_account_password.html:7 msgid "Current password" @@ -2786,115 +2918,77 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "Zmiana awataru na" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/my_account/my_account_profile.html:12 #: kallithea/templates/admin/users/user_edit_profile.html:9 msgid "Using" msgstr "Używa:" -#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/my_account/my_account_profile.html:14 #: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "Avatary są wyłączone" -#: kallithea/templates/admin/my_account/my_account_profile.html:13 +#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "[zamknięty] wniosek o połączenie gałęzi" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "Otwarty przez mnie" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "Wniosek połączenia gałęzi #%s otwarty %s" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "Zamknięte" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "Potwierdź usunięcie połączenia gałęzi" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "Nic tu nie ma jeszcze" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "Biorę udział w" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "Wniosek połączenia gałęzi #%s otwarty %s dnia %s" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" -msgstr "" +#, fuzzy +msgid "Repositories You Own" +msgstr "Nie znaleziono repozytorium." #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "Nie znaleziono rekordów." #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" -msgstr "" +#, fuzzy +msgid "Repositories You are Watching" +msgstr "Położenie repozytorium" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "Opcje powiadomień" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "Wszystkie" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "Komentarze" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "Połączone gałęzie" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +#, fuzzy +msgid "Mark All Read" msgstr "Oznacz wszystko jako przeczytane" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2902,38 +2996,41 @@ msgstr "Brak powiadomień" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" +#: kallithea/templates/admin/notifications/show_notification.html:11 +#, fuzzy +msgid "Show Notification" msgstr "Pokaż powiadomienia" -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "Powiadomienia" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" +#, fuzzy +msgid "Permissions Administration" msgstr "Uprawnienia administracji" -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "Uprawnienia" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "Globalne" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +#, fuzzy +msgid "IP Whitelist" msgstr "Lista dozwolonych adresów IP" -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "Podgląd" @@ -2944,8 +3041,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2968,7 +3065,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "Repozytorium grupy" @@ -3008,8 +3105,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3029,7 +3126,7 @@ msgstr "Autoryzacja aktywacji zewnętrznego konta" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -3040,7 +3137,8 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +#, fuzzy +msgid "All IP addresses are allowed." msgstr "Wszystkie adresy IP są dozwolone" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -3049,68 +3147,64 @@ msgstr "Nowy adres ip" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "Repozytorium grupy" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "Repozytorium grupy" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +#, fuzzy +msgid "Default User Permissions Overview" +msgstr "Domyślne uprawnienia" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "Grupy Repozytoriów" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "Nazwa grupy" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Rodzic gropy" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "Grupy Repozytoriów" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +#, fuzzy, python-format +msgid "%s Repository Group Settings" +msgstr "Repozytorium grupy" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "Ustawienia" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "Zaawansowane" @@ -3134,7 +3228,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "Utworzono" @@ -3236,57 +3330,63 @@ "Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do " "wszystkich innych grup i repozytoriów wewnątrz" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Remove this group" +msgstr "Tworzenie grup użytkowników" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "Potwierdź usunięcie grupy użytkowników: %s" + #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "Strona Główna" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "używając" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" +#, fuzzy +msgid "Repository Groups Administration" msgstr "Repozytoria grup administracyjnych" -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#, fuzzy +msgid "Number of Top-level Repositories" msgstr "Liczba najwyższego poziomu repozytorium" -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" -msgstr "Dodaj repozytorium" - #: kallithea/templates/admin/repos/repo_add_base.html:14 msgid "Import existing repository ?" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "Klonuj z" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +#, fuzzy +msgid "Optional URL from which repository should be cloned." msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane." #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3295,7 +3395,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "Docelowa rewizja" @@ -3306,171 +3406,184 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +#, fuzzy, python-format +msgid "%s Creating Repository" +msgstr "utworzone repozytorium %s" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" -msgstr "" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "Używaj w repozytorium dodatkowych pól" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +#, fuzzy +msgid "Extra Fields" +msgstr "Dodatkowe pola" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" -msgstr "Dodatkowe pola" +msgid "Caches" +msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "Zdalnie" -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "Statystyki" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "Gałąź z" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +#, fuzzy +msgid "Parent" +msgstr "Rodzic gropy" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "Ustaw" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" +#, fuzzy +msgid "Manually set this repository as a fork of another from the list." msgstr "Ręczne ustawienie rozwidlenia z listy" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#, fuzzy +msgid "Public Journal Visibility" +msgstr "Dziennik publiczny" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "Usuń z dziennika publicznego" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +#, fuzzy +msgid "Add to Public Journal" +msgstr "Dziennik publiczny" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 +#, fuzzy msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" +"All actions done in this repository will be visible to everyone in the " +"public journal." msgstr "" "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla " "wszystkich w dzienniku publicznym" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +#, fuzzy +msgid "Change Locking" +msgstr "Włącz blokowanie" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +#, fuzzy +msgid "Confirm to unlock repository." msgstr "Potwierdź odblokowanie repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "Odblokowane repozytorium" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." msgstr "Potwierdź blokowanie repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "Odblokowane repozytorium" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "Repozytorium nie jest zablokowane" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Potwierdź usunięcie repozytorium: %s" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "Usuń ta grupę repozytoriów" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "to repozytorium ma %s fork" msgstr[1] "to repozytorium ma %s forki" msgstr[2] "to repozytorium ma %s forków" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "Ustaw jako rozwidlenie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "Usuń rozwidlenie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" -msgstr "" -"To repozytorium zostanie zmienione w sposób szczególny, żeby było " -"niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go " -"z systemu plików prosimy zrobić to ręcznie" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +#, fuzzy +msgid "Invalidate Repository Cache" msgstr "Unieważnij pamięć podręczną repozytorium" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +#, fuzzy +msgid "Confirm to invalidate repository cache." msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#, fuzzy msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"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 dodany do bufora ponownie" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +#, fuzzy +msgid "List of Cached Values" msgstr "Lista buforowanych wartości" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3483,12 +3596,12 @@ msgstr "Klucz" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "Aktywny" @@ -3522,27 +3635,31 @@ msgstr "Wprowadź opis pola" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" -msgstr "" +#, fuzzy +msgid "Extra fields are disabled." +msgstr "Avatary są wyłączone" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "private repository" msgstr "prywatne repozytorium" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" -msgstr "" +#, fuzzy +msgid "Remote URL" +msgstr "Url klonowania" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +#, fuzzy +msgid "Pull Changes from Remote Location" msgstr "Pobierz z zdalnej lokalizacji" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +#, fuzzy +msgid "Confirm to pull changes from remote side." msgstr "Potwierdź pull z zdalnej strony" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3550,7 +3667,7 @@ msgstr "Brak zmiennej id" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3560,16 +3677,18 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" -msgstr "Klonowane uri" +#: kallithea/templates/summary/summary.html:72 +#, fuzzy +msgid "Clone URL" +msgstr "Url klonowania" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 #: kallithea/templates/base/perms_summary.html:43 @@ -3589,15 +3708,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." -msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." +msgid "URL used for doing remote pulls." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" @@ -3614,47 +3728,51 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" -msgstr "" +#, fuzzy +msgid "Reset Statistics" +msgstr "%s Statystyki" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +#, fuzzy +msgid "Confirm to remove current statistics." msgstr "Potwierdź usunięcie aktualnych statystyk" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" +#, fuzzy +msgid "Repositories Administration" msgstr "Administracja repozytoriami" -#: kallithea/templates/admin/repos/repos.html:54 +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" +#, fuzzy +msgid "Settings Administration" msgstr "Ustawienia administracji" -#: kallithea/templates/admin/settings/settings.html:40 +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "Aktualizacja" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3723,35 +3841,42 @@ msgstr "Sfera uwierzytelniania HTTP" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "Kod Google Analytics" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" msgstr "Zapisz ustawienia" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3761,10 +3886,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" +#, fuzzy +msgid "Custom Hooks" msgstr "Niestandardowa aktualizacja" -#: kallithea/templates/admin/settings/settings_hooks.html:69 +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "Nie udało się usunąć hooka" @@ -3778,9 +3904,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3788,19 +3913,18 @@ msgstr "Unieważnia cache dla wszystkich repozytoriów" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." -msgstr "" +#, fuzzy +msgid "Check this to reload data and clear cache keys for all repositories." +msgstr "Unieważnia cache dla wszystkich repozytoriów" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3817,7 +3941,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3842,11 +3966,12 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" -msgstr "" +#, fuzzy +msgid "Git version" +msgstr "Edycja Uprawnień" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3854,7 +3979,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3862,7 +3987,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3875,8 +4000,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3896,7 +4021,8 @@ msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +#, fuzzy +msgid "Mercurial extensions" msgstr "Rozszerzenia Mercurial" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3909,13 +4035,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "Położenie repozytorium" +#, fuzzy +msgid "Location of repositories" +msgstr "Ogólna liczba repozytoriów" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" @@ -3927,8 +4054,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3957,8 +4084,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3974,8 +4101,10 @@ #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -3988,71 +4117,73 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "Pozycja panelu" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "Ikony" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +#, fuzzy +msgid "Show public/private icons next to repository names." +msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "Tagowanie meta" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Dodaj grupę użytkowników" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "Grupy użytkowników" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -4062,19 +4193,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "Domyślne uprawnienia" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "Użytkownik" @@ -4093,7 +4219,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "Nie ma jeszcze żadnego użytkownika" @@ -4101,23 +4227,16 @@ msgid "Chosen group members" msgstr "Wybrane grupy użytkowników" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "Usuń wszystkie elementy" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "Dostępni użytkownicy" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "Dodaj wszystkie elementy" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" +#, fuzzy +msgid "User Groups Administration" msgstr "Użytkownicy grupy administracji" -#: kallithea/templates/admin/user_groups/user_groups.html:13 +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4125,18 +4244,19 @@ msgid "Add user" msgstr "Dodaj użytkownika" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "Użytkownicy" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "Potwierdzenie hasła" @@ -4145,14 +4265,15 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +msgid "Default Permissions" +msgstr "Domyślne uprawnienia" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4164,6 +4285,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4210,193 +4332,192 @@ msgstr "Potwierdzenie nowego hasła" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" +#, fuzzy +msgid "Users Administration" msgstr "Administracja użytkownikami" -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "użytkownicy" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "imię" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" -msgstr "nazwisko" - #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "Ostatnio zalogowany" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "Wystąpienia serwera: %s" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +#, fuzzy +msgid "Create Fork" +msgstr "Usuń rozwidlenie" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Podsumowanie" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "Dziennik zmian" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Pliki" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "Przełącz do" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 msgid "Options" msgstr "Opcje" -#: kallithea/templates/base/base.html:166 +#: kallithea/templates/base/base.html:158 #: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +#, fuzzy +msgid "Compare Fork" msgstr "Porównaj rozwidlenie" -#: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 +#: kallithea/templates/branches/branches.html:56 #: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 +#: kallithea/templates/tags/tags.html:56 #: kallithea/templates/tags/tags_data.html:13 msgid "Compare" msgstr "Porównaj" -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Szukaj" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:166 msgid "Unlock" msgstr "Odblokowany" +#: kallithea/templates/base/base.html:168 +msgid "Lock" +msgstr "zablokowane" + #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "zablokowane" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "Obserwuj" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "Nie obserwuj" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Gałąź" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "Zaloguj się" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "Zaloguj się do swojego konta" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "Nie pamiętasz hasła?" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "Wyloguj się" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "Pokaż ostatnią aktywność" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Dziennik" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "Dziennik publiczny" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "Wyświetl publiczne gists" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "Utwórz nowy gist" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" +#: kallithea/templates/base/base.html:241 +#, fuzzy +msgid "All Public Gists" msgstr "Wszystkie publiczne gists" -#: kallithea/templates/base/base.html:330 -msgid "My public gists" +#: kallithea/templates/base/base.html:243 +#, fuzzy +msgid "My Public Gists" msgstr "Moje publiczne gists" -#: kallithea/templates/base/base.html:331 -msgid "My private gists" +#: kallithea/templates/base/base.html:244 +#, fuzzy +msgid "My Private Gists" msgstr "Moje prywatne gists" -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#, fuzzy +msgid "My Pull Requests" +msgstr "Połączone gałęzie" + +#: kallithea/templates/base/base.html:292 +#, fuzzy +msgid "Not Logged In" +msgstr "Zaloguj się" + +#: kallithea/templates/base/base.html:299 +#, fuzzy +msgid "Login to Your Account" +msgstr "Zaloguj się do swojego konta" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "Nie pamiętasz hasła?" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "Wyloguj się" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4463,112 +4584,123 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" msgstr "Dodaj kolejny komentarz" -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "Grupa" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "użytkownik" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "Ładuję..." -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "ładuję ..." -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "Szukaj obcięte" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "Nie ma plików pasujących" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +#, fuzzy +msgid "Open New Pull Request" msgstr "Otwórz nową prośbę o połączenie gałęzi" -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" +#: kallithea/templates/base/root.html:32 +#, fuzzy +msgid "Open New Pull Request for Selected Changesets" msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" +#: kallithea/templates/base/root.html:33 +#, fuzzy +msgid "Show Selected Changesets __S → __E" msgstr "Pokaż wybrane zmiany __S -> __E" -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" +#: kallithea/templates/base/root.html:34 +#, fuzzy +msgid "Show Selected Changeset __S" msgstr "Pokaż wybrane zmiany __S -> __E" -#: kallithea/templates/base/root.html:58 -msgid "Selection link" +#: kallithea/templates/base/root.html:35 +#, fuzzy +msgid "Selection Link" msgstr "Wybór linku" -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +#, fuzzy +msgid "Collapse Diff" msgstr "Pliki różnic" -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" +#: kallithea/templates/base/root.html:37 +#, fuzzy +msgid "Expand Diff" msgstr "poprawka różnic" -#: kallithea/templates/base/root.html:61 +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "Nie udało się cofnąć uprawnienia" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/base/root.html:39 +#, fuzzy +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "potwierdzić odwołanie pozwolenie na {0}: {1} ?" -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" -msgstr "" +#: kallithea/templates/base/root.html:43 +#, fuzzy +msgid "Specify changeset" +msgstr "Wybrane zmiany" #: kallithea/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s Zakładki" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "Autor" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "Rewizja" @@ -4578,7 +4710,7 @@ msgid "%s Branches" msgstr "%s Gałęzie" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4595,193 +4727,200 @@ msgstr[1] "pokazano %d z %d rewizji" msgstr[2] "pokazano %d z %d rewizji" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "Wyświetl" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "Wyczyść zaznaczenie" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "Potwierdź blokowanie repozytorium" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "porównaj gałęzie %s" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "Wyświetl" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, fuzzy, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "porównaj gałęzie %s" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +#, fuzzy +msgid "Branch filter:" +msgstr "filtr" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "Status grupy zmian: %s⏎ Kliknij, aby otworzyć prośby pobrania #%s" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "Status grupy zmian: %s" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 +#: kallithea/templates/changelog/changelog.html:124 +#: kallithea/templates/compare/compare_cs.html:30 msgid "Changeset has comments" msgstr "Komentarze Grupy zmian" -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "Zakładki %s" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "Tagi %s" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "Gałęzie %s" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "Nie ma jeszcze zmian" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "Usunięto" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "Zmiana" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "Dodana" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "Zarażone pliki %s" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "Komentarz" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 msgid "Age" msgstr "Ostatnia zmiana" -#: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "Gałąź/Etykieta" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "Wyślij zmiany do nowego repo" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "Istniejące repozytorium?" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s Grupy zmian" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "Status grupy zmian" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "Raw różnic" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "Poprawka różnic" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "Pobierz różnice" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d komentarz" -msgstr[1] "%d komentarzy" -msgstr[2] "%d komentarzy" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "(%d linii)" -msgstr[1] "(%d linii)" -msgstr[2] "(%d linii)" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "połącz" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +#, fuzzy +msgid "Grafted from:" +msgstr "Utworzono" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4789,9 +4928,9 @@ msgstr[1] "%s pliki zostały zmienione" msgstr[2] "%s plików zostało zmienionych" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4799,124 +4938,164 @@ msgstr[1] "%s plików zostało zmienionych z %s inercjami i %s usunięciami" msgstr[2] "%s plików zostało zmienionych z %s inercjami i %s usunięciami" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "Pokazuje pełną edycję, może zająć to trochę czasu i zasobów" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +#, fuzzy +msgid "Show full diff anyway" msgstr "Pokaż pełną historię" -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "Głosowanie do grupy zmian #%s" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "Zmiana statusu w grupie zmian" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +#, fuzzy +msgid "No title" +msgstr "nowy plik" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +#, fuzzy +msgid "Comment from pull request" msgstr "Komentarz połączenia gałęzi %s" -#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:32 msgid "Status change on changeset" msgstr "Zmiana statusu w grupie zmian" -#: kallithea/templates/changeset/changeset_file_comment.html:32 +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "Skomentuj grupę zmian" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "Przesyłanie..." - -#: kallithea/templates/changeset/changeset_file_comment.html:66 +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" +msgstr "%d komentarz" + +#: kallithea/templates/changeset/changeset_file_comment.html:67 msgid "Commenting on line {1}." msgstr "Komentując linię {1}." -#: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "Komentarze analizowane za pomocą %s składni od %s wsparcia." -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +#, fuzzy +msgid "Use @username inside this text to notify another user" msgstr "" "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do " "użytkownika strony" -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" -msgstr "Podgląd" - #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "Podgląd komentarza" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +#, fuzzy +msgid "Submitting ..." +msgstr "Przesyłanie..." + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "Komentarz" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "Podgląd" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "Musisz być zalogowany żeby komentarz." -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "Zaloguj się teraz" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "Ukryj" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d komentarz" +msgstr[1] "%d komentarzy" +msgstr[2] "%d komentarzy" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "(%d linii)" +msgstr[1] "(%d linii)" +msgstr[2] "(%d linii)" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, fuzzy, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "Główne" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +#, fuzzy +msgid "Use @username inside this text to send notification to another local user." +msgstr "" +"Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do " +"użytkownika strony" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "Zagłosuj na żądanie na grupę zmian" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" msgstr "Zmiana statusu grupy zmian" -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "Zamknij (po zatwierdzeniu lub odrzuceniu)" +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "Bez zmian" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(zamknięty)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s Zestawienie zmian" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "Pliki naruszone" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "Pokaż pełną edycję tego pliku" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "Pokaż pełną listę zmian i różnic obok siebie" @@ -4924,13 +5103,15 @@ msgid "Show inline comments" msgstr "Pokaż online komentarz" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "Pokaż plik w najnowszej wersji, w tym repo" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" -msgstr "Pokaż plik w pierwotnej wersji w repo" +#: kallithea/templates/changeset/diff_block.html:87 +#, fuzzy +msgid "Deleted" +msgstr "usuń" + +#: kallithea/templates/changeset/diff_block.html:90 +#, fuzzy +msgid "Renamed" +msgstr "zmień nazwę" #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -4940,30 +5121,57 @@ msgid "Ancestor" msgstr "Przodek" +#: kallithea/templates/compare/compare_cs.html:61 +#, fuzzy +msgid "Show merge diff" +msgstr "Pokaż pełną historię" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +#, fuzzy +msgid "Common ancestor" +msgstr "Skomentuj grupę zmian" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +#, fuzzy +msgid "is" +msgstr "Gist" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "%s Zestawienie zmian" + +#: kallithea/templates/compare/compare_cs.html:85 +#, fuzzy +msgid "behind" +msgstr "Indeksuj ponownie" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "%s Porównaj" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "Porównaj wersje" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4972,38 +5180,43 @@ msgstr[2] "Pokaż %s komentarze" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "Brak plików" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "Pokaż pełną historię" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "Repozytorium mercurial" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "Repozytorium git" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "Publiczne repozytorium" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "Nie ma jeszcze zestawienia zmian" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "Subskrybuj %s kanał rss" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "Subskrybuj %s kanał atom" @@ -5012,29 +5225,34 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, fuzzy, python-format +msgid "Comment from %s on %s changeset %s" msgstr "%s komentarzy %s zestawów zmian." -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "Status zestawienia zmian został zmieniony na" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." -msgstr "To jest powiadomienie z strony" +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" msgstr "Witaj %s" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "Otrzymaliśmy prośbę o utworzenie nowego hasła do twojego konta." -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "Możesz wygenerować nowe hasło klikając w link URL poniżej:" @@ -5042,69 +5260,52 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "Proszę zignorować tą wiadomość, jeśli nie poproś o nowe hasło." -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "" -"%s zgłosił wniosek połączenia w repozytorium %s i chce żeby sprawdzić " -"zmiany." - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "Tytuł" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:5 +#, fuzzy, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, fuzzy, python-format +msgid "%s requested your review of %s pull request \"%s\"" msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +#, fuzzy +msgid "The comment was made with status" msgstr "Wniosek połączenia został zamknięty ze statusem" -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" -msgstr "Wniosek połączenia zmienił status" - #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "Zobacz tego użytkownika tutaj" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "Zostaniesz przekierowany do %s za %s sekund" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "Pliki z listą zmian i różnic: %s" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "Pliki różnic" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "ignoruj spacje" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "włączyć tryb edycji" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "%s Pliki różnic" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "Pliki %s" @@ -5114,85 +5315,84 @@ msgid "%s Files Add" msgstr "Pliki %s" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "Dodaj nowy plik" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Położenie" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "lub" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "Nowy tryb pliku" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" msgstr "Zatwierdź zmiany" -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "rewizja" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "poprzednia wersja" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "następna wersja" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "Obserwuj aktualną gałąź" -#: kallithea/templates/files/files_browser.html:25 +#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:29 +#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "Wczytywanie listy plików..." -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "Rozmiar" -#: kallithea/templates/files/files_browser.html:43 +#: kallithea/templates/files/files_browser.html:62 msgid "Mimetype" msgstr "Typ MIME" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "Rewizja" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" +#: kallithea/templates/files/files_browser.html:64 +#, fuzzy +msgid "Last Modified" msgstr "Ostatnio modyfikowany" -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:65 +#, fuzzy +msgid "Last Committer" msgstr "Autor" #: kallithea/templates/files/files_delete.html:4 @@ -5200,8 +5400,8 @@ msgid "%s Files Delete" msgstr "%s Usuń Plik" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "Usuń plik" @@ -5210,32 +5410,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "Edytuj plik" -#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_edit.html:48 #: kallithea/templates/files/files_source.html:32 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:55 +#: kallithea/templates/files/files_edit.html:50 #: kallithea/templates/files/files_source.html:35 msgid "Download as Raw" msgstr "" -#: kallithea/templates/files/files_edit.html:58 +#: kallithea/templates/files/files_edit.html:53 msgid "Source" msgstr "Źródło" -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_edit.html:58 msgid "Editing file" msgstr "Edycja pliku" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5283,12 +5479,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "Plik binarny (%s)" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "Plik jest za duży do wyświetlenia" @@ -5309,9 +5505,9 @@ msgid "%s Followers" msgstr "Obserwatorzy %s" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "Obserwuje" @@ -5324,31 +5520,36 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "Nazwa rozgałęzienia" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +#, fuzzy +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "Prywatny" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "Skopiuj uprawnienia" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "Skopiuj zezwolenia z rozwidlenia repozytorium" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "Aktualizuj po klonowaniu" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "Sprawdź źródło po wykonaniu klonowania" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5357,9 +5558,9 @@ msgid "%s Forks" msgstr "Gałąź %s" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "Gałęzie" @@ -5367,102 +5568,164 @@ msgid "Forked" msgstr "Rozgałęziony" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "Nie ma jeszcze gałęzi" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "Dziennik kanału ATOM" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "Dziennik kanału RSS" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" msgstr "Moje repo" -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "Brak wpisów jeszcze" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Dziennik Publiczny" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "Publiczny dziennik kanału ATOM" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "Publiczny dziennik kanału RSS" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" +#, fuzzy +msgid "New Pull Request" msgstr "Nowa prośba o połączenie gałęzi" -#: kallithea/templates/pullrequests/pullrequest.html:44 +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "Tytuł" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "Napisz krótki opis tego tego połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "Przepływ zestawienia zmian" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "Repozytorium git" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "Recenzje wniosków połączenia gałęzi" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "właściciel" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "Pokarz wszystkie zmiany" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "Szczegółowe porównanie widoku" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "Repozytorium docelowe" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +#, fuzzy +msgid "Pull Request Reviewers" +msgstr "Recenzje wniosków połączenia gałęzi" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +#, fuzzy +msgid "No entries" +msgstr "Brak wpisów jeszcze" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, fuzzy, python-format +msgid "Latest vote: %s" +msgstr "ostatni tip" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +#, fuzzy +msgid "Delete Pull Request" +msgstr "Nowa prośba o połączenie gałęzi" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "Potwierdź usunięcie połączenia gałęzi" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "Zamknięte" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "%s Połączonych gałęzi #%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "Nowy status" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, fuzzy, python-format +msgid "Pull request #%s from %s#%s" +msgstr "Wniosek połączenia gałęzi #%s otwarty %s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#, fuzzy +msgid "Summarize the changes" +msgstr "Zatwierdź zmiany" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "Nie ma jeszcze recenzenta" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5470,63 +5733,131 @@ msgstr[1] "%d recenzenci" msgstr[2] "%d recenzentów" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "Połączenie gałęzi zostało zweryfikowane przez wszystkich recenzentów" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "Nie ma jeszcze gałęzi" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#, fuzzy +msgid "on" +msgstr "brak" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "Pobierz zmiany" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +#, fuzzy +msgid "Created by" +msgstr "utworzono" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +msgid "Update" +msgstr "[zaktualizowany] użytkownik" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "właściciel" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "recenzent" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "Pokarz wszystkie zmiany" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "recenzent" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "Podgląd komentarza" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" -msgstr "Wyświetl porównanie" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +#, fuzzy +msgid "Save as New Pull Request" +msgstr "Otwórz nową prośbę o połączenie gałęzi" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "Ostatnia aktywność" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +#, fuzzy +msgid "Pull Request Content" +msgstr "Wniosek połączenia zmienił status" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" msgstr "%s Moje prośby połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" -msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, fuzzy, python-format +msgid "Pull Requests from %s'" +msgstr "Połączonych gałęzi #%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, fuzzy, python-format +msgid "Pull Requests to '%s'" +msgstr "Połączonych gałęzi #%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, fuzzy, python-format +msgid "Show Pull Requests to %s" +msgstr "Pokaż Prośby Pobrania %s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, fuzzy, python-format +msgid "Show Pull Requests from '%s'" +msgstr "Pokaż Prośby Pobrania %s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#, fuzzy +msgid "Pull Requests Created by Me" +msgstr "Recenzje wniosków połączenia gałęzi" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#, fuzzy +msgid "Pull Requests I Participate In" +msgstr "Biorę udział w" #: kallithea/templates/search/search.html:6 #, python-format @@ -5534,27 +5865,28 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" +#: kallithea/templates/search/search.html:16 +#, fuzzy +msgid "Search in All Repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "Szukana fraza" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "Szukaj w" -#: kallithea/templates/search/search.html:68 +#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "Zawartość pliku" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "Komunikaty" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "Nazwy plików" @@ -5569,67 +5901,67 @@ msgid "%s Statistics" msgstr "%s Statystyki" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "%s RSS" -#: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 msgid "Enable" msgstr "Włącz" -#: kallithea/templates/summary/statistics.html:42 +#: kallithea/templates/summary/statistics.html:39 msgid "Stats gathered: " msgstr "Statystyki zebrane: " -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "pliki" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "Pokaż więcej" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:389 msgid "commits" msgstr "komunikaty" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:390 msgid "files added" msgstr "pliki dodane" +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "pliki zmienione" + +#: kallithea/templates/summary/statistics.html:392 +msgid "files removed" +msgstr "pliki usunięte" + #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" -msgstr "pliki zmienione" +msgid "commit" +msgstr "komunikaty" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" -msgstr "pliki usunięte" +msgid "file added" +msgstr "plik dodany" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" +msgstr "plik zmieniony" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "komunikaty" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "plik dodany" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "plik zmieniony" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "plik usunięty" @@ -5638,78 +5970,80 @@ msgid "%s Summary" msgstr "Podsumowanie %s" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "Repozytorium zablokowane przez %s" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "Repozytorium odblokowane" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "Url klonowania" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "Gałąź z" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "Pokaż nazwę" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "Pokaż ID" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "Statystyki" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:111 msgid "Download" msgstr "Pobierz" -#: kallithea/templates/summary/summary.html:119 +#: kallithea/templates/summary/summary.html:115 msgid "There are no downloads yet" msgstr "Nie pobrano jeszcze plików" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "Pobierz jako zip" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "z subrepozytorium" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "Rozmiar Repozytorium" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "Kanał RSS" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" msgstr "Ostatnia aktywność" -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" +#: kallithea/templates/summary/summary.html:191 +#, fuzzy +msgid "Quick Start" msgstr "Szybki start" -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "Pobierz %s jak %s" @@ -5719,6 +6053,8 @@ msgid "%s Tags" msgstr "Etykiety pliku %s" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" +#: kallithea/templates/tags/tags.html:26 +#, fuzzy +msgid "Compare Tags" msgstr "Porównaj tagi" +
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -6,89 +6,93 @@ # gnustavo <gustavo@gnustavo.com>, 2013 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" "Language-Team: Portuguese (Brazil) " "<https://hosted.weblate.org/projects/kallithea/kallithea/pt_BR/>\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "Todos os Ramos" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Nenhum" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(fechado)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "Mostrar espaços em branco" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorar espaços em branco" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "Mudança de estado -> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "%d comentário" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "Mudar o estado de um changeset associado a um pull request não é permitido" -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "Página inicial" - -#: kallithea/controllers/error.py:101 +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 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:104 +#: kallithea/controllers/error.py:99 msgid "Unauthorized access to resource" msgstr "Acesso não autorizado ao recurso" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:101 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:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "O recurso não pôde ser encontrado" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -107,12 +111,12 @@ msgstr "%s - feed %s" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "Conjunto de mudanças era grande demais e foi cortado..." @@ -130,161 +134,166 @@ msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, fuzzy, python-format +msgid "%s at %s" +msgstr "em %s e %s" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, 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:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 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:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "Arquivo %s editado via Kallithea" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "Sem modificações" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "Arquivo adicionado via Kallithea" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "Nenhum conteúdo" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "Nenhum nome de arquivo" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 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:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "Downloads desabilitados" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "Repositório vazio" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "Tipo de arquivo desconhecido" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Ramos" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Etiquetas" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repositórios" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "diário público" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "diário" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "Você foi registrado no Kallithea com sucesso" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" @@ -292,56 +301,127 @@ "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " "seu e-mail" -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(fechado)" + +#: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Conjunto de Mudanças" -#: kallithea/controllers/pullrequests.py:157 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:158 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Ramos pares" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "O pull request requer um título com no mínimo três caracteres" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +#, fuzzy +msgid "No description" +msgstr "Descrição" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Novo pull request criado com sucesso" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +#, fuzzy +msgid "Error occurred while creating pull request" msgstr "Ocorreu um erro durante o envio do pull request" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +#, fuzzy +msgid "Pull request update created" +msgstr "Revisores do pull request" + +#: kallithea/controllers/pullrequests.py:503 +#, fuzzy +msgid "Pull request updated" +msgstr "Pull requests para %s" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "Fechando com" - -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" -"Não é permitido fechar um pull request em um estado diferente de " -"rejeitado ou aprovado" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +#, fuzzy +msgid "Closing." +msgstr "carregando ..." #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -352,23 +432,26 @@ msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" +#, fuzzy +msgid "An error occurred during search operation." msgstr "Ocorreu um erro durante essa operação de busca" -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +#, fuzzy +msgid "No data ready yet" msgstr "Ainda não há dados carregados" -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" @@ -376,68 +459,68 @@ msgid "Default settings updated successfully" msgstr "Configurações padrão atualizadas com sucesso" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "Ocorreu um erro durnge a atualização dos padrões" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "para sempre" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" -msgstr "para sempre" +msgid "5 minutes" +msgstr "cinco minutos" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" -msgstr "cinco minutos" +msgid "1 hour" +msgstr "uma hora" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" -msgstr "uma hora" +msgid "1 day" +msgstr "um dia" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "um dia" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "um mês" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "Ocorreu um erro durante a criação de um gist" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "Gist %s excluído" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -446,62 +529,55 @@ 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:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, 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:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "Email %s adicionado ao usuário" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante o salvamento do email" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "Email removido do usuário" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Nenhum" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -517,28 +593,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "Administrador" @@ -560,26 +636,26 @@ msgstr "Permitido com ativação automática de conta" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" @@ -595,21 +671,21 @@ msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Ocorreu um erro durante a atualização das permissões" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, 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:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "Grupo de repositórios %s atualizado" @@ -639,182 +715,182 @@ 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:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 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:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "Ocorreu um erro durante a revocação das permissões" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "Erro ao criar repositório %s" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, 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:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "%s bifurcações excluídas" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "Repositório %s excluído" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, 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:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "Ocorreu um erro durante a criação do campo" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante a remoção do campo" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:526 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: kallithea/controllers/admin/repos.py:526 +#: kallithea/controllers/admin/repos.py:530 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:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "Descompasso de Token" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "Nada" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "Ocorreu um erro durante o destravamento" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "Destravado" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "Travado" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "O repositório foi %s" -#: kallithea/controllers/admin/repos.py:618 +#: kallithea/controllers/admin/repos.py:622 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:622 +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 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:673 +#: kallithea/controllers/admin/repos.py:677 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:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "Configurações de VCS atualizadas" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, 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:270 @@ -833,23 +909,23 @@ msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:418 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" @@ -858,106 +934,114 @@ msgid "Created user group %s" msgstr "Grupo de usuários %s criado" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, 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:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "Grupo de usuários %s atualizado" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, 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:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "Grupo de usuários excluído com sucesso" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 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:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "O grupo destino não pode ser o mesmo" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "Permissões atualizadas" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante o salvamento das permissões" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "Usuário %s criado" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "Ocorreu um erro durante a criação do usuário %s" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "Usuário excluído com sucesso" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "Você não pode editar esse usuário" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "Ocorreu um erro durante o salvamento do IP" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 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:846 +#: kallithea/lib/auth.py:843 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:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "Conjunto de alterações não encontrado" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Arquivo binário" @@ -972,163 +1056,158 @@ msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "Excluído ramo: %s" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "Tag criada: %s" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "Conjunto de alterações não encontrado" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "comparar exibir" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "e" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "%s mais" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "revisões" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "nome da bifurcação %s" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "Pull request #%s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:771 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 msgid "[created] repository" msgstr "repositório [criado]" -#: kallithea/lib/helpers.py:747 +#: kallithea/lib/helpers.py:775 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:781 msgid "[downloaded] archive from repository" msgstr "[baixado] archive do repositório" -#: kallithea/lib/helpers.py:755 +#: kallithea/lib/helpers.py:783 msgid "[delete] repository" msgstr "[excluir] repositório" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:791 msgid "[created] user" msgstr "usuário [criado]" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:793 msgid "[updated] user" msgstr "usuário [atualizado]" -#: kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:795 msgid "[created] user group" msgstr "[criado] grupo de usuários" -#: kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:797 msgid "[updated] user group" msgstr "[atualizado] grupo de usuários" -#: kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:799 msgid "[commented] on revision in repository" msgstr "[comentado] em revisão no repositório" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:801 msgid "[commented] on pull request for" msgstr "[comentado] no pull request para" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:803 msgid "[closed] pull request for" msgstr "[fechado] pull request para" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:805 msgid "[pushed] into" msgstr "[realizado push] para" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:807 msgid "[committed via Kallithea] into repository" msgstr "[commitado via Kallithea] no repositório" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:809 msgid "[pulled from remote] into repository" msgstr "[pulled do remote] no repositório" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr " e mais %s" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "Nenhum Arquivo" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "novo arquivo" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "excluir" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "renomear" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1139,74 +1218,104 @@ "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:415 +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "em %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "%s atrás" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "em %s e %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "agora há pouco" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "Nenhum acesso ao repositório" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "Acesso de leitura ao repositório" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1216,12 +1325,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "Nenhum acesso ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "Acesso de escrita ao repositório" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1231,162 +1340,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" -msgstr "Acesso de leitura ao repositório" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" +msgstr "Acesso administrativo ao repositório" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" -msgstr "Acesso de escrita ao repositório" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" +msgstr "Nenhum acesso ao Grupo de Repositórios" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" -msgstr "Acesso administrativo ao repositório" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "Acesso de leitura ao Grupo de Repositórios" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" +msgstr "Acesso de escrita ao Grupo de Repositórios" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "Nenhum acesso ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" -msgstr "Acesso de leitura ao Grupo de Repositórios" +msgid "Repository Group admin access" +msgstr "Acesso administrativo ao Grupo de Repositórios" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" -msgstr "Acesso de escrita ao Grupo de Repositórios" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" +msgstr "Administrador do Kallithea" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" -msgstr "Acesso administrativo ao Grupo de Repositórios" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "Criação de repositórios desabilitada" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" +msgstr "Criação de repositórios habilitada" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "Administrador do Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "Criação de repositórios desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" -msgstr "Criação de repositórios habilitada" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "Bifurcação de repositórios desabilitada" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "Bifurcação de repositórios habilitada" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" +msgstr "Registro desabilitado" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "Bifurcação de repositórios desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "Bifurcação de repositórios habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" -msgstr "Registro desabilitado" +msgid "Register new user with Kallithea with manual activation" +msgstr "Registro de novo usuário no Kallithea com ativação manual" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "Registro de novo usuário no Kallithea com ativação manual" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "Registro de novo usuário no Kallithea com auto-ativação" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "Não Revisado" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "Aprovado" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1396,12 +1505,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "Não Revisado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "Rejeitado" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1411,52 +1520,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "Aprovado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "Rejeitado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "Sob Revisão" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "nível superior" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "Sem acesso ao grupo de repositórios" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "Acesso de leitura ao grupo de repositórios" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1465,9 +1568,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" -msgstr "Sem acesso ao grupo de repositórios" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" +msgstr "Acesso de escrita ao grupo de repositórios" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1477,23 +1580,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "Acesso de leitura ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "Acesso de escrita ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "Acesso administrativo ao grupo de repositórios" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1501,9 +1591,20 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" -msgstr "Acesso administrativo ao grupo de repositórios" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "Sem acesso ao grupo de usuários" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" +msgstr "Acesso de leitura ao grupo de usuários" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1512,9 +1613,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" -msgstr "Sem acesso ao grupo de usuários" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" +msgstr "Acesso de escrita ao grupo de usuários" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1523,20 +1624,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "Acesso de leitura ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" -msgstr "Acesso de escrita ao grupo de usuários" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" +msgstr "Acesso administrativo ao grupo de usuários" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1545,21 +1635,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "Acesso administrativo ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "Criação de Grupo de Repositórios desatilibada" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "Criação de Grupo de Repositórios habilitada" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1567,32 +1657,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "Criação de Grupo de Repositórios habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "Criação de Grupo de Usuários desabilitada" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "Criação de Grupo de Usuários habilitada" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "Registro desatilitado" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "Registro de Usuário com ativação manual de conta" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1600,48 +1701,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "Registro desatilitado" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "Registro de Usuário com ativação manual de conta" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "na linha %s" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "[Menção]" @@ -1667,98 +1746,147 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s comentou no changeset em %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s enviou mensagem em %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s mencionou-o em %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s registrou-se no Kallithea em %(when)s" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s abriu um novo pull request em %(when)s" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s comentou no pull request em %(when)s" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, fuzzy, python-format +msgid "New user %(new_username)s registered" +msgstr "O username \"%(username)s\" não é válido" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +#, fuzzy +msgid "Closing" +msgstr "Usando" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "tip mais recente" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "Novo registro de usuário" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 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/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: kallithea/model/user.py:276 -#, python-format +#: kallithea/model/user.py:261 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" +"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:268 +#, fuzzy, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" +"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:275 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" msgstr "" "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:304 +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "Link para trocar senha" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "Sua nova senha" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "Sua nova senha no Kallithea: %s" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "O valor não pode ser uma lista vazia" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "O username \\\"%(username)s\\\" já existe" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "O username \\\"%(username)s\\\" é proibido" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" @@ -1766,25 +1894,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:151 +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:158 +#: kallithea/model/validators.py:139 #, python-format msgid "Username %(username)s is not valid" msgstr "O username \"%(username)s\" não é válido" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:158 msgid "Invalid user group name" msgstr "Nome inválido de grupo de usuários" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "O grupo de usuários \"%(usergroup)s\" já existe" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1793,106 +1921,108 @@ "underscores, pontos ou hífens, e deve começar om um caractere alfa-" "numérico" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "Não é possível associar esse grupo como progenitor" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "O grupo \\\"%(group_name)s\\\" já existe" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, 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:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "Caracteres inválidos (não-ascii) na senha" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:291 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: kallithea/model/validators.py:327 +#: kallithea/model/validators.py:308 msgid "invalid password" msgstr "senha inválida" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:309 msgid "invalid user name" msgstr "nome de usuário inválido" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:310 msgid "Your account is disabled" msgstr "Sua conta está desabilitada" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "O nome de repositório %(repo)s não é permitido" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Um repositório chamado %(repo)s já existe" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, 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:378 +#: kallithea/model/validators.py:359 #, 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:493 -msgid "invalid clone url" +#: kallithea/model/validators.py:474 +#, fuzzy +msgid "invalid clone URL" msgstr "URL de clonagem inválida" -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +#: kallithea/model/validators.py:475 +#, fuzzy +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" msgstr "URL inválida, por favor, forneça uma URL de clone http(s)/svn+http(s)" -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:500 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:534 +#: kallithea/model/validators.py:515 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:536 +#: kallithea/model/validators.py:517 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:585 +#: kallithea/model/validators.py:566 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:626 +#: kallithea/model/validators.py:607 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:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "o e-mail \"%(email)s\" não existe." -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1900,36 +2030,36 @@ "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:804 +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" "As revisões %(revs)s já fazem parte de um pull request ou já setaram o " "estado" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 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:837 +#: kallithea/model/validators.py:818 #, 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:870 +#: kallithea/model/validators.py:851 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:884 +#: kallithea/model/validators.py:865 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:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1940,35 +2070,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "filtro rápido..." #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "repositórios" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -1985,164 +2116,165 @@ msgstr "" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "Descrição" -#: kallithea/templates/index_base.html:126 +#: kallithea/templates/index_base.html:129 #: kallithea/templates/admin/my_account/my_account_repos.html:46 #: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 #: kallithea/templates/admin/repos/repo_add_base.html:9 #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 #: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks.html:49 #: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 +#: kallithea/templates/branches/branches.html:49 #: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 #: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "Nome" -#: kallithea/templates/index_base.html:129 +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "Última Alteração" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "Ponta" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "Dono" -#: kallithea/templates/index_base.html:141 +#: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "Clique para ordenar em ordem crescente" -#: kallithea/templates/index_base.html:142 +#: kallithea/templates/index_base.html:145 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 msgid "Click to sort descending" msgstr "Clique para ordenar em ordem descrescente" -#: kallithea/templates/index_base.html:143 +#: kallithea/templates/index_base.html:146 msgid "No repositories found." msgstr "Nenhum repositório encontrado." -#: kallithea/templates/index_base.html:144 +#: kallithea/templates/index_base.html:147 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 msgid "Data error." msgstr "Erro de dados." -#: kallithea/templates/index_base.html:145 +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "Carregando..." -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "Entrar" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "Log in em %s" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "Nome de usuário" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "Senha" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "Lembre-se de mim" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "Entrar" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "Esqueceu sua senha ?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "Não possui uma conta ?" @@ -2150,80 +2282,87 @@ msgid "Password Reset" msgstr "Senha Trocada" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, fuzzy, python-format +msgid "Reset Your Password to %s" +msgstr "Esqueceu sua senha ?" + +#: kallithea/templates/password_reset.html:14 +#, fuzzy +msgid "Reset Your Password" +msgstr "Esqueceu sua senha ?" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" +#: kallithea/templates/password_reset.html:46 +#, fuzzy +msgid "Send Password Reset Email" +msgstr "Link para trocar senha" + +#: kallithea/templates/password_reset.html:47 +#, fuzzy +msgid "" +"Password reset link will be sent to the email address matching your " +"username." msgstr "" "Link de reinicialização de senha será enviado ao endereço de e-mail " "correspondente" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "Inscrever-se" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "Repita a senha" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "Primeiro Nome" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "Último Nome" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "Sua conta será ativada logo após o registro ser concluído" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" -msgstr "Sua conta precisa esperar ativação por um administrador" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." +msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "Ainda não há ramos" @@ -2242,38 +2381,40 @@ msgstr "Ainda não há marcadores" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +#, fuzzy +msgid "Admin Journal" msgstr "Diário do administrador" -#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/admin/admin.html:10 msgid "journal filter..." msgstr "filtro de diário..." -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +#, fuzzy +msgid "Filter" msgstr "filtro" -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "%s entrada" msgstr[1] "%s entradas" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "Ação" @@ -2283,11 +2424,11 @@ msgstr "Repositório" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Data" @@ -2304,90 +2445,91 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "Salvar" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" msgstr "Padrões de repositórios" -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "Padrões" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "Tipo" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "Repositório privado" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2395,71 +2537,71 @@ "Repositórios privados são visíveis somente por pessoas explicitamente " "adicionadas como colaboradores." -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "Habilitar estatísticas" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 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:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "Habilitar downloads" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "Habilitar menu de descarregar na página de sumário." -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "Habilitar travas" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 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:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "Descrição do gist ..." -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 msgid "Gist lifetime" msgstr "Tempo de vida do Gist" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "Expira" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2467,75 +2609,69 @@ msgid "never" msgstr "nunca" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "Cancelar" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, fuzzy, python-format +msgid "Private Gists for User %s" msgstr "Gists privados do usuário %s" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, fuzzy, python-format +msgid "Public Gists for User %s" msgstr "Gists públicos do usuário %s" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "Gists Públicos" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "Criado" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "Não há nenhum gist ainda" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2543,118 +2679,114 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "Limpar" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "Gist" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "Excluir" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Editar" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "criado" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "Mostrar original" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "Minha conta" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "Minha Conta" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" -msgstr "" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" +msgstr "Seguindo" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "Seguindo" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "Pull requests" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +#, fuzzy +msgid "My Permissions" msgstr "Minhas permissões" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2725,7 +2857,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2746,7 +2877,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2755,8 +2886,9 @@ msgstr "Novo endereço de email" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" -msgstr "" +#, fuzzy +msgid "Change Your Account Password" +msgstr "Sua nova senha" #: kallithea/templates/admin/my_account/my_account_password.html:7 msgid "Current password" @@ -2771,115 +2903,77 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "Altere o seu avatar em" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/my_account/my_account_profile.html:12 #: kallithea/templates/admin/users/user_edit_profile.html:9 msgid "Using" msgstr "Usando" -#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/my_account/my_account_profile.html:14 #: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:13 +#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "Mostrar pull requests fechados" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "Abertos por mim" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "Pull request $%s aberto em %s" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "Fechado" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "Confirme para excluir este pull request" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "Não há nada aqui ainda" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "Eu participo em" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "Pull request #%s aberto por %s em %s" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" -msgstr "" +#, fuzzy +msgid "Repositories You Own" +msgstr "Nenhum repositório encontrado." #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "Nenhum registro encontrado." #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" -msgstr "" +#, fuzzy +msgid "Repositories You are Watching" +msgstr "Localização dos repositórios" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "Minhas Notificações" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "Todos" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "Comentários" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "Pull Requests" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +#, fuzzy +msgid "Mark All Read" msgstr "Marcar tudo como lido" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2887,38 +2981,40 @@ msgstr "Ainda não há notificações aqui" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" +#: kallithea/templates/admin/notifications/show_notification.html:11 +#, fuzzy +msgid "Show Notification" msgstr "Mostrar notificação" -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "Notificações" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" +#, fuzzy +msgid "Permissions Administration" msgstr "Administração de permissões" -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "Permissões" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "" @@ -2929,8 +3025,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2953,7 +3049,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "Grupo de repositórios" @@ -2992,8 +3088,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3013,7 +3109,7 @@ msgstr "Ativação de autenticação de conta externa" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -3024,7 +3120,8 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +#, fuzzy +msgid "All IP addresses are allowed." msgstr "Todos os endereços IP são permitidos" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -3033,68 +3130,64 @@ msgstr "Novo endereço IP" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "Adicionar grupo de repositórios" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "Grupo de repositórios" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +#, fuzzy +msgid "Default User Permissions Overview" +msgstr "Permissões padrão" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "Nome do grupo" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Progenitor do grupo" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +#, fuzzy, python-format +msgid "%s Repository Group Settings" +msgstr "Grupo de repositórios" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "Configurações" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "" @@ -3118,7 +3211,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "Criado em" @@ -3219,60 +3312,66 @@ "Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os" " outros grupos e repositórios dentro deles" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Remove this group" +msgstr "Criar grupos de usuários" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "Confirme para excluir este grupo de usuário: %s" + #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "Início" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "com" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" +#, fuzzy +msgid "Repository Groups Administration" msgstr "Administração de grupos de repositórios" -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#, fuzzy +msgid "Number of Top-level Repositories" msgstr "Número de repositórios de nível superior" -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" -msgstr "Adicionar repositório" - #: kallithea/templates/admin/repos/repo_add_base.html:14 msgid "Import existing repository ?" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "Clonar de" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +#, fuzzy +msgid "Optional URL from which repository should be cloned." msgstr "URL opcional http[s] da qual o repositório deve ser clonado." #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Seja sucinto e objetivo. Use um arquivo README para descrições mais " "longas." #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." -msgstr "Opcionalmente, selecione um grupo no qual colocar este repositório" +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." +msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." #: kallithea/templates/admin/repos/repo_add_base.html:63 msgid "Type of repository to create." @@ -3280,7 +3379,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "Revisão de pouso" @@ -3291,173 +3390,185 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +#, fuzzy, python-format +msgid "%s Creating Repository" +msgstr "Erro ao criar repositório %s" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" -msgstr "" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "Usar campos extras do repositório" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +#, fuzzy +msgid "Extra Fields" +msgstr "Campos extras" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" -msgstr "Campos extras" +msgid "Caches" +msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "Remoto" -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "Estatísticas" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "Bifurcação de" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +#, fuzzy +msgid "Parent" +msgstr "Progenitor do grupo" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" +#, fuzzy +msgid "Manually set this repository as a fork of another from the list." msgstr "" "Marque manualmente este repositório como uma bifurcação de um outro da " "lista" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#, fuzzy +msgid "Public Journal Visibility" +msgstr "diário público" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "Remover do diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +#, fuzzy +msgid "Add to Public Journal" +msgstr "diário público" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 +#, fuzzy msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" +"All actions done in this repository will be visible to everyone in the " +"public journal." msgstr "" "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:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +#, fuzzy +msgid "Change Locking" +msgstr "Habilitar travas" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +#, fuzzy +msgid "Confirm to unlock repository." msgstr "Confirme para destravar repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "Repositório público" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." msgstr "Confirme para travar repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "Repositório público" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "Repositório não está travado" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "[excluir] repositório" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, 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:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "Desassociar bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "Excluir bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" -msgstr "" -"Este repositório será renomeado de um modo especial para não ser mais " -"acessívei pelo Kallithea ou outros sistemas VCS. Se você precisa " -"excluí-lo totalmente do sistema de arquivos, por favor, faça-o " -"manualmente" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +#, fuzzy +msgid "Invalidate Repository Cache" msgstr "Invalidar cache do repositório" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +#, fuzzy +msgid "Confirm to invalidate repository cache." msgstr "Confirma invalidar cache do repositório" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#, fuzzy msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "" "Invalidar manualmente o cache deste repositório. No próximo acesso o " "repositório será cacheado novamente" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +#, fuzzy +msgid "List of Cached Values" msgstr "Lista de valores cacheados" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3470,12 +3581,12 @@ msgstr "Chave" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "Ativo" @@ -3509,27 +3620,31 @@ msgstr "Entre com a descrição de um campo" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" -msgstr "" +#, fuzzy +msgid "Extra fields are disabled." +msgstr "Registro desabilitado" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "private repository" msgstr "repositório privado" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" -msgstr "" +#, fuzzy +msgid "Remote URL" +msgstr "URL de clonagem" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +#, fuzzy +msgid "Pull Changes from Remote Location" msgstr "Realizar pull de alterações a partir de localização remota" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +#, fuzzy +msgid "Confirm to pull changes from remote side." msgstr "Confirma realizar pull de alterações a partir de lado remoto" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3537,7 +3652,7 @@ msgstr "ID inalterável" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3547,16 +3662,18 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" -msgstr "URI de clonagem" +#: kallithea/templates/summary/summary.html:72 +#, fuzzy +msgid "Clone URL" +msgstr "URL de clonagem" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 #: kallithea/templates/base/perms_summary.html:43 @@ -3576,15 +3693,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." -msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." +msgid "URL used for doing remote pulls." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme" @@ -3601,47 +3713,51 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" -msgstr "" +#, fuzzy +msgid "Reset Statistics" +msgstr "Habilitar estatísticas" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +#, fuzzy +msgid "Confirm to remove current statistics." msgstr "Confirma remover atuais estatísticas" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" +#, fuzzy +msgid "Repositories Administration" msgstr "Administração de repositórios" -#: kallithea/templates/admin/repos/repos.html:54 +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" +#, fuzzy +msgid "Settings Administration" msgstr "Administração de configurações" -#: kallithea/templates/admin/settings/settings.html:40 +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "Ganchos" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3710,35 +3826,42 @@ msgstr "Realm de autenticação HTTP" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "Código do Google Analytics" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" msgstr "Salvar configurações" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3748,10 +3871,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" +#, fuzzy +msgid "Custom Hooks" msgstr "Ganchos customizados" -#: kallithea/templates/admin/settings/settings_hooks.html:69 +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "Falha ao remover gancho" @@ -3765,9 +3889,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3775,19 +3898,18 @@ msgstr "Invalidar o cache para todos os repositórios" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." -msgstr "" +#, fuzzy +msgid "Check this to reload data and clear cache keys for all repositories." +msgstr "Invalidar o cache para todos os repositórios" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3804,7 +3926,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3829,11 +3951,12 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" -msgstr "" +#, fuzzy +msgid "Git version" +msgstr "Editar Permissão" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3841,7 +3964,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3849,7 +3972,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3862,8 +3985,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3883,7 +4006,8 @@ msgstr "Atualizar repositório após realizar push (hg update)" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +#, fuzzy +msgid "Mercurial extensions" msgstr "Extensões do Mercurial" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3896,13 +4020,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "Localização dos repositórios" +#, fuzzy +msgid "Location of repositories" +msgstr "Criar repositórios" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" @@ -3914,8 +4039,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3944,8 +4069,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3961,8 +4086,10 @@ #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -3975,71 +4102,73 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "Itens do dashboard" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "Ícones" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "Mostrar ícone de repositório público nos repositórios" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "Mostrar ícone de repositório privado nos repositórios" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +#, fuzzy +msgid "Show public/private icons next to repository names." +msgstr "Mostrar ícone de repositório público nos repositórios" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "Meta-Tagging" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Adicionar grupo de usuários" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "Grupos de usuários" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -4049,19 +4178,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "Permissões padrão" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "Membros" @@ -4080,7 +4204,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "Nenhum membro ainda" @@ -4088,23 +4212,16 @@ msgid "Chosen group members" msgstr "Membros escolhidos do grupo" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "Remover todos os elementos" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "Membros disponíveis" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "Adicionar todos os elementos" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" +#, fuzzy +msgid "User Groups Administration" msgstr "Administração de grupos de usuários" -#: kallithea/templates/admin/user_groups/user_groups.html:13 +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4112,18 +4229,19 @@ msgid "Add user" msgstr "Adicionar usuário" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "Usuários" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "Confirmação de senha" @@ -4132,14 +4250,15 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +msgid "Default Permissions" +msgstr "Permissões padrão" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4151,6 +4270,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4197,193 +4317,192 @@ msgstr "Confirmação de nova senha" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" +#, fuzzy +msgid "Users Administration" msgstr "Administração de usuários" -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "usuários" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "Primeiro nome" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" -msgstr "Último nome" - #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "Último login" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "Instância de servidor: %s" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +#, fuzzy +msgid "Create Fork" +msgstr "Excluir bifurcações" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Sumário" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "Registro de alterações" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Arquivos" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "Trocar Para" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 msgid "Options" msgstr "Opções" -#: kallithea/templates/base/base.html:166 +#: kallithea/templates/base/base.html:158 #: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +#, fuzzy +msgid "Compare Fork" msgstr "Compare bifurcação" -#: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 +#: kallithea/templates/branches/branches.html:56 #: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 +#: kallithea/templates/tags/tags.html:56 #: kallithea/templates/tags/tags_data.html:13 msgid "Compare" msgstr "Compare" -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Pesquisar" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:166 msgid "Unlock" msgstr "Destravar" +#: kallithea/templates/base/base.html:168 +msgid "Lock" +msgstr "Travar" + #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "Travar" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "Seguir" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "Parar de seguir" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Bifurcação" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostrar Pull Requests para %s" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "Não logado" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "Entrar com sua conta" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "Esqueceu a senha ?" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "Sair" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "Mostrar atividade recente" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Diário" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "Diário público" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "Mostrar gists públicos" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "Criar novo gist" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" +#: kallithea/templates/base/base.html:241 +#, fuzzy +msgid "All Public Gists" msgstr "Todos os gists públicos" -#: kallithea/templates/base/base.html:330 -msgid "My public gists" +#: kallithea/templates/base/base.html:243 +#, fuzzy +msgid "My Public Gists" msgstr "Meus gists públicos" -#: kallithea/templates/base/base.html:331 -msgid "My private gists" +#: kallithea/templates/base/base.html:244 +#, fuzzy +msgid "My Private Gists" msgstr "Meus gists privados" -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "Buscar nos repositórios" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#, fuzzy +msgid "My Pull Requests" +msgstr "Pull requests" + +#: kallithea/templates/base/base.html:292 +#, fuzzy +msgid "Not Logged In" +msgstr "Não logado" + +#: kallithea/templates/base/base.html:299 +#, fuzzy +msgid "Login to Your Account" +msgstr "Entrar com sua conta" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "Esqueceu a senha ?" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "Sair" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4450,112 +4569,123 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" msgstr "Adicionar outro comentário" -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "Grupo" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "membros" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "Carregando..." -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "carregando ..." -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "Busca truncada" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "Nenhum arquivo encontrado" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +#, fuzzy +msgid "Open New Pull Request" msgstr "Crie novo pull request" -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" +#: kallithea/templates/base/root.html:32 +#, fuzzy +msgid "Open New Pull Request for Selected Changesets" msgstr "Abrir novo pull request para os changesets selecionados" -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" +#: kallithea/templates/base/root.html:33 +#, fuzzy +msgid "Show Selected Changesets __S → __E" msgstr "Mostrar changesets selecionados __S -> __E" -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" +#: kallithea/templates/base/root.html:34 +#, fuzzy +msgid "Show Selected Changeset __S" msgstr "Mostrar changesets selecionados __S" -#: kallithea/templates/base/root.html:58 -msgid "Selection link" +#: kallithea/templates/base/root.html:35 +#, fuzzy +msgid "Selection Link" msgstr "Link da seleção" -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +#, fuzzy +msgid "Collapse Diff" msgstr "Colapsar diff" -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" +#: kallithea/templates/base/root.html:37 +#, fuzzy +msgid "Expand Diff" msgstr "Expandir diff" -#: kallithea/templates/base/root.html:61 +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "Falhou ao revocar a permissão" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/base/root.html:39 +#, fuzzy +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "confirme para revogar permissão para {0}: {1} ?" -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" -msgstr "" +#: kallithea/templates/base/root.html:43 +#, fuzzy +msgid "Specify changeset" +msgstr "%s Changeset" #: kallithea/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s Bookmarks" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "Autor" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "Revisão" @@ -4565,7 +4695,7 @@ msgid "%s Branches" msgstr "%s Ramos" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4581,27 +4711,38 @@ msgstr[0] "mostrando %d de %d revisão" msgstr[1] "mostrando %d de %d revisões" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "Mostrar" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "Deselecionar seleção" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "Confirme para travar repositório" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "Comparar bifurcação com %s" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "Mostrar" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, fuzzy, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "Comparar bifurcação com %s" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +#, fuzzy +msgid "Branch filter:" +msgstr "filtro" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" @@ -4610,299 +4751,332 @@ "Estado do changeset: %s\n" "Clique para abrir os pull request #%s associado" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "Estado do changeset: %s" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 +#: kallithea/templates/changelog/changelog.html:124 +#: kallithea/templates/compare/compare_cs.html:30 msgid "Changeset has comments" msgstr "O changeset tem comentários" -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "Bookmark %s" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "Tag %s" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "Ramo %s" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "Ainda não há alteações" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "Removido" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "Modificado" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "Adicionado" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "Afetados %s arquivos" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "Mensagem de commit" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 msgid "Age" msgstr "Idade" -#: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "Refs" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "Adicionar ou enviar arquivos diretamente pelo Kallithea" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "Fazer push de novo repositório" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "Repositório existente?" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s Changeset" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "Estado do changeset" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "Diff cru" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "D" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "Baixar diff" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d comentário" -msgstr[1] "%d comentários" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "(%d em linha)" -msgstr[1] "(%d em linha)" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "mesclar" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +#, fuzzy +msgid "Grafted from:" +msgstr "Criado em" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s arquivo modificado" msgstr[1] "%s arquivos modificados" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s arquivo modificado com %s inserções e %s exclusões" msgstr[1] "%s arquivos modificados com %s inserções e %s exclusões" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" -"Mostrar um diff muito grande pode levar muito tempo e gastar muitos " -"recursos" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +#, fuzzy +msgid "Show full diff anyway" msgstr "Mostrar diff completo" -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "Vote no pull request #%s" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "Alteração de estado no changeset" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +#, fuzzy +msgid "No title" +msgstr "novo arquivo" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +#, fuzzy +msgid "Comment from pull request" msgstr "Comentar no pull request #%s" -#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:32 msgid "Status change on changeset" msgstr "Alteração de estado no changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:32 +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "Comentário no changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "Enviando..." - -#: kallithea/templates/changeset/changeset_file_comment.html:66 +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" +msgstr "%d comentário" + +#: kallithea/templates/changeset/changeset_file_comment.html:67 msgid "Commenting on line {1}." msgstr "Comentando a linha {1}." -#: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "Comentários interpretados usando a sintaxe %s com suporte a %s." -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +#, fuzzy +msgid "Use @username inside this text to notify another user" msgstr "" "Use @nomedeusuário dentro desse texto para enviar notificação a este " "usuário do Kallithea" -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" -msgstr "Visualizar" - #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "Visualizar comentário" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +#, fuzzy +msgid "Submitting ..." +msgstr "Enviando..." + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "Comentário" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "Visualizar" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "Você precisa estar logado para comentar." -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "Entrar agora" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "Ocultar" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d comentário" +msgstr[1] "%d comentários" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "(%d em linha)" +msgstr[1] "(%d em linha)" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, fuzzy, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "Geral" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +#, fuzzy +msgid "Use @username inside this text to send notification to another local user." +msgstr "" +"Use @nomedeusuário dentro desse texto para enviar notificação a este " +"usuário do Kallithea" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "Vote para estado do pull request" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" msgstr "Altere o estado do changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "Fechar (quando aprovado ou rejeitado)" +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "Sem modificações" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(fechado)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s Changesets" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "Arquivos afetados" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "Mostrar diff completo para este arquivo" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "Mostrar diff completo lado-a-lado para este arquivo" @@ -4910,13 +5084,15 @@ msgid "Show inline comments" msgstr "Mostrar comentários inline" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "Mostrar última versão do arquivo neste repo" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" -msgstr "Mostrar versão inicial do arquivo neste repo" +#: kallithea/templates/changeset/diff_block.html:87 +#, fuzzy +msgid "Deleted" +msgstr "excluir" + +#: kallithea/templates/changeset/diff_block.html:90 +#, fuzzy +msgid "Renamed" +msgstr "renomear" #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -4926,30 +5102,57 @@ msgid "Ancestor" msgstr "Antecessor" +#: kallithea/templates/compare/compare_cs.html:61 +#, fuzzy +msgid "Show merge diff" +msgstr "Mostrar diff completo" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +#, fuzzy +msgid "Common ancestor" +msgstr "Comentário no changeset" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +#, fuzzy +msgid "is" +msgstr "Gist" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "%s Changesets" + +#: kallithea/templates/compare/compare_cs.html:85 +#, fuzzy +msgid "behind" +msgstr "Reindexar" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "%s Comparar" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "Comparar revisões" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4957,38 +5160,43 @@ msgstr[1] "Mostrando %s commits" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "Nenhum arquivo" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "Mostrar diff completo" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "Repositório Mercurial" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "Repositório Git" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "Repositório público" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "Nenhum conjunto de alterações ainda." -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "Assinar o feed rss de %s" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "Assinar o feed atom de %s" @@ -4997,29 +5205,34 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, fuzzy, python-format +msgid "Comment from %s on %s changeset %s" msgstr "%s comentou num changeset de %s." -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "O estado do changeset foi alterado para" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." -msgstr "Esta é uma notificação do Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" msgstr "Olá %s" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "Recebemos uma requisição para criar uma nova senha para sua conta." -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "Você pode gerá-la clicando na seguinte URL" @@ -5027,67 +5240,52 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "Por favor, ignore este email se você não requisitou uma nova senha." -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "%s abriu um pull request para o repositório %s e espera sua revisão." - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "Título" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:5 +#, fuzzy, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%s comentou no pull request \"%s\"" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, fuzzy, python-format +msgid "%s requested your review of %s pull request \"%s\"" msgstr "%s comentou no pull request \"%s\"" -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "%s comentou no pull request \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "%s comentou no pull request \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +#, fuzzy +msgid "The comment was made with status" msgstr "O pull request foi fechado com o estado" -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" -msgstr "O pull request mudou de estado" - #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "Veja este usuário aqui" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "Você será redirecionado para %s em %s segundos" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "Arquivo %s diff lado-a-lado" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "Diff do arquivo" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "ignorar espaços em branco" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "habilitar modo de edição" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "%s Diff de Arquivo" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "%s Arquivos" @@ -5097,85 +5295,84 @@ msgid "%s Files Add" msgstr "%s Adicionar Arquivos" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "Adicionar novo arquivo" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Local" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "ou" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" msgstr "Realizar commit das alterações" -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "Revisão anterior" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "Próxima revisão" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "Seguir o ramo atual" -#: kallithea/templates/files/files_browser.html:25 +#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:29 +#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "Carregando lista de arquivos..." -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "Tamanho" -#: kallithea/templates/files/files_browser.html:43 +#: kallithea/templates/files/files_browser.html:62 msgid "Mimetype" msgstr "Mimetype" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "Última revisão" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" +#: kallithea/templates/files/files_browser.html:64 +#, fuzzy +msgid "Last Modified" msgstr "Última alteração" -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:65 +#, fuzzy +msgid "Last Committer" msgstr "Último commiter" #: kallithea/templates/files/files_delete.html:4 @@ -5183,8 +5380,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5193,32 +5390,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "Editar arquivo" -#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_edit.html:48 #: kallithea/templates/files/files_source.html:32 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:55 +#: kallithea/templates/files/files_edit.html:50 #: kallithea/templates/files/files_source.html:35 msgid "Download as Raw" msgstr "" -#: kallithea/templates/files/files_edit.html:58 +#: kallithea/templates/files/files_edit.html:53 msgid "Source" msgstr "Fonte" -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_edit.html:58 msgid "Editing file" msgstr "Editando arquivo" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5265,12 +5458,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "Arquivo binário (%s)" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "Arquivo é grande demais para exibir" @@ -5291,9 +5484,9 @@ msgid "%s Followers" msgstr "%s Seguidores" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "Seguidores" @@ -5306,31 +5499,36 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "Nome da bifurcação" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +#, fuzzy +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "Privado" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "Copiar permissões" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "Copiar permissões do repositório bifurcado" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "Atualizar após clonar" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "Checkout fontes depois de criar o clone" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5339,9 +5537,9 @@ msgid "%s Forks" msgstr "%s Bifurcações" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "Bifurcações" @@ -5349,193 +5547,325 @@ msgid "Forked" msgstr "Bifurcado" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "Ainda não há bifurcações" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "ATOM feed do diário" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "RSS feed do diário" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" msgstr "Meus repositórios" -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "Ainda não há entradas" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Diário Público" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "ATOM feed do diário público" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "RSS feed do diário público" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" +#, fuzzy +msgid "New Pull Request" msgstr "Novo pull request" -#: kallithea/templates/pullrequests/pullrequest.html:44 +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "Título" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "Escreva uma breve descrição para este pull request" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "Fluxo de changesets" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "Repositório origem" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "Revisores do pull request" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "dono" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "Adicionar revisor a este pull request" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "Visão de comparação detalhada" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "Repositório de destino" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +#, fuzzy +msgid "Pull Request Reviewers" +msgstr "Revisores do pull request" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +#, fuzzy +msgid "No entries" +msgstr "Ainda não há entradas" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, fuzzy, python-format +msgid "Latest vote: %s" +msgstr "tip mais recente" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +#, fuzzy +msgid "Delete Pull Request" +msgstr "Novo pull request" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "Confirme para excluir este pull request" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "Fechado" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "%s Pull Request #%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "Estado da revisão" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, fuzzy, python-format +msgid "Pull request #%s from %s#%s" +msgstr "Pull requests de %s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#, fuzzy +msgid "Summarize the changes" +msgstr "Realizar commit das alterações" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "Estado do pull request calculado a partir dos votos" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "Ainda não revisado por" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d revisor" msgstr[1] "%d revisores" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "O pull request foi revisado por todos os revisores" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "Ainda não há ramos" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#, fuzzy +msgid "on" +msgstr "nenhum" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "Puxar mudanças" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +#, fuzzy +msgid "Created by" +msgstr "criado" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +msgid "Update" +msgstr "usuário [atualizado]" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "dono" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "revisor" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "Adicionar ou remover revisor a este pull request" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "revisor" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "Visualizar comentário" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" -msgstr "Visão de comparação" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +#, fuzzy +msgid "Save as New Pull Request" +msgstr "Crie novo pull request" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "Mudanças mais recentes" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +#, fuzzy +msgid "Pull Request Content" +msgstr "O pull request mudou de estado" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" msgstr "%s Pull Requests" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, fuzzy, python-format +msgid "Pull Requests from %s'" msgstr "Pull requests de %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, fuzzy, python-format +msgid "Pull Requests to '%s'" +msgstr "Pull requests para %s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, fuzzy, python-format +msgid "Show Pull Requests to %s" msgstr "Pull requests para %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "Esconder pull requests fechados" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, fuzzy, python-format +msgid "Show Pull Requests from '%s'" +msgstr "Pull requests de %s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +#, fuzzy +msgid "Show closed pull requests (in addition to open pull requests)" msgstr "Mostrar pull requests fechados também" +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#, fuzzy +msgid "Pull Requests Created by Me" +msgstr "Revisores do pull request" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#, fuzzy +msgid "Pull Requests I Participate In" +msgstr "Eu participo em" + #: kallithea/templates/search/search.html:6 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" +#: kallithea/templates/search/search.html:16 +#, fuzzy +msgid "Search in All Repositories" msgstr "Buscar em todos os repositórios" -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "Termo de pesquisa" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "Pesquisando em" -#: kallithea/templates/search/search.html:68 +#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "Conteúdo dos arquivos" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "Mensagens de commit" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "Nomes dos arquivos" @@ -5550,67 +5880,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM feed" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "%s RSS feed" -#: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 msgid "Enable" msgstr "Habilitar" -#: kallithea/templates/summary/statistics.html:42 +#: kallithea/templates/summary/statistics.html:39 msgid "Stats gathered: " msgstr "Estatísticas coletadas:" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "arquivos" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "Mostrar mais" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:389 msgid "commits" msgstr "commits" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:390 msgid "files added" msgstr "arquivos adicionados" +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "arquivos alterados" + +#: kallithea/templates/summary/statistics.html:392 +msgid "files removed" +msgstr "arquivos removidos" + #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" -msgstr "arquivos alterados" +msgid "commit" +msgstr "commit" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" -msgstr "arquivos removidos" +msgid "file added" +msgstr "arquivo adicionado" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" +msgstr "arquivo alterado" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "commit" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "arquivo adicionado" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "arquivo alterado" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "arquivo removido" @@ -5619,78 +5949,80 @@ msgid "%s Summary" msgstr "%s Sumário" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "Repositório travado por %s" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "Repositório destravado" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "URL de clonagem" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "Bifurcação de" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "Mostrar por Nome" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "Mostrar por ID" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "Tendências em arquivos" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:111 msgid "Download" msgstr "Download" -#: kallithea/templates/summary/summary.html:119 +#: kallithea/templates/summary/summary.html:115 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "Download como zip" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "Marque isto para descarregar arquivo com subrepositórios" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "com subrepositórios" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "Tamanho do Repositório" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "Feed" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" msgstr "Mudanças mais recentes" -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" +#: kallithea/templates/summary/summary.html:191 +#, fuzzy +msgid "Quick Start" msgstr "Início rápido" -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" @@ -5700,7 +6032,8 @@ msgid "%s Tags" msgstr "%s Tags" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" +#: kallithea/templates/tags/tags.html:26 +#, fuzzy +msgid "Compare Tags" msgstr "Comparar tags"
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2015-01-28 15:13+0200\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Russian " @@ -27,78 +27,82 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.2-dev\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "Ещё не было изменений" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "Все ветки" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Ничего" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(закрыто)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "Отображать пробелы" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Игнорировать пробелы" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "увеличить контекст до %(num)s строк" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "Нет такой ревизии в этом репозитории" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "Изменение статуса -> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "%d комментарий" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" -"Нельзя редактировать статус изменений, связанных с закрытыми pull-request'ами" - -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +"Нельзя редактировать статус изменений, связанных с закрытыми pull-" +"request'ами" + +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "Выбрать набор изменений" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "Домашняя страница" - -#: kallithea/controllers/error.py:101 +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 msgid "The request could not be understood by the server due to malformed syntax." msgstr "Запрос не распознан сервером из-за неправильного синтаксиса." -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:99 msgid "Unauthorized access to resource" msgstr "Несанкционированный доступ к ресурсу" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:101 msgid "You don't have permission to view this page" msgstr "У вас нет прав для просмотра этой страницы" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "Ресурс не найден" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -115,12 +119,12 @@ msgstr "Лента новостей %s %s" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "Изменения оказались слишком большими и были вырезаны..." @@ -138,221 +142,296 @@ msgid "There are no files yet. %s" msgstr "Нет файлов. %s" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, fuzzy, python-format +msgid "%s at %s" +msgstr "в %s и %s" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Репозиторий заблокировал %s в %s" -#: kallithea/controllers/files.py:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " -msgstr "" -"Вы можете удалять файлы только в ревизии, связанной с существующей веткой " - -#: kallithea/controllers/files.py:324 +msgstr "Вы можете удалять файлы только в ревизии, связанной с существующей веткой " + +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s удалён с помощью Kallithea" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s удалён" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "Во время коммита произошла ошибка" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" "Вы можете редактировать файлы только в ревизии, связанной с существующей " "веткой " -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s отредактирован с помощью Kallithea" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "Без изменений" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "Изменения применены в %s" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "Файл добавлен с помощью Kallithea" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "Пусто" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "Безымянный" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Расположение должно быть относительным путем, и не должно содержать " "\"..\" в пути" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "Возможность скачивать отключена" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Неизвестная ревизия %s" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "Пустой репозитарий" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "Неизвестный тип архива" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "Набор изменений" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Ветки" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Метки" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "Произошла ошибка во время создания форка репозитория %s" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "Группы" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Репозитории" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "Тэги" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "Закладки" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "общедоступный журнал" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "журнал" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "неверная капча" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "Регистрация в Kallithea прошла успешно" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "Ссылка для сброса пароля отправлена" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "Сброс пароля произведён, новый пароль был отправлен на ваш email" -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(закрыто)" + +#: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Изменения" -#: kallithea/controllers/pullrequests.py:157 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Специальный" -#: kallithea/controllers/pullrequests.py:158 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Ветки участника" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Закладки" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "Заголовок pull-запроса должен быть не менее 3-х символов" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "Ошибка при создании pull-запроса: %s" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +#, fuzzy +msgid "No description" +msgstr "Описание" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Pull-запрос создан успешно" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +#, fuzzy +msgid "Error occurred while creating pull request" msgstr "Произошла ошибка при создании pull-запроса" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +#, fuzzy +msgid "Pull request update created" +msgstr "Рецензенты запросов на внесение изменений Pull request" + +#: kallithea/controllers/pullrequests.py:503 +#, fuzzy +msgid "Pull request updated" +msgstr "Pull-запросы для %s" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "Закрытый с" - -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" -"Закрытие pull-запроса со статусом, отличным от «Одобрено» или «Отклонено», " -"невозможно" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +#, fuzzy +msgid "Closing." +msgstr "загрузка..." #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -363,23 +442,26 @@ msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" +#, fuzzy +msgid "An error occurred during search operation." msgstr "Произошла ошибка при выполнении этого поиска" -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +#, fuzzy +msgid "No data ready yet" msgstr "Данные пока не загружены" -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "Статистические данные отключены для этого репозитария" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "Настройки авторизации успешно обновлены" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "произошла ошибка при обновлении настроек авторизации" @@ -387,68 +469,68 @@ msgid "Default settings updated successfully" msgstr "Стандартные настройки успешно обновлены" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "Произошла ошибка при обновлении стандартных настроек" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "навсегда" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" -msgstr "навсегда" +msgid "5 minutes" +msgstr "5 минут" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" -msgstr "5 минут" +msgid "1 hour" +msgstr "1 час" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" -msgstr "1 час" +msgid "1 day" +msgstr "1 день" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "1 день" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "1 месяц" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "Срок" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "Произошла ошибка во время создания gist-записи" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "Gist-запись %s удалена" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -459,62 +541,55 @@ "Вы не можете изменить данные этого пользователя, поскольку он важен для " "работы всего приложения" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "Ваша учетная запись успешно обновлена" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "Произошла ошибка при обновлении пользователя %s" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "Пароль обновлён" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "Ошибка при обновлении пароля" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "Пользователю добавлен e-mail %s" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "Произошла ошибка при сохранении e-mail" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "E-mail пользователя удалён" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Ничего" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -530,28 +605,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "Администратор" @@ -573,26 +648,26 @@ msgstr "Разрешена, с автоматической активацией учётной записи" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "Автоматическая активация внешней учетной записи" @@ -608,21 +683,21 @@ msgid "Global permissions updated successfully" msgstr "Глобальные привилегии успешно обновлены" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Произошла ошибка во время обновления привилегий" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "Создана новая группа репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Произошла ошибка при создании группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "Группа репозиториев %s обновлена" @@ -652,169 +727,169 @@ msgid "Error occurred during deletion of repository group %s" msgstr "Произошла ошибка при удалении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "Администратор не может отозвать свои привелегии" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "Привилегии группы репозиториев обновлены" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "Произошла ошибка при отзыве привелегии" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "Произошла ошибка при создании репозитория %s" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "Репозиторий %s создан из %s" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "Сделан форк(копия) репозитория %s на %s" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "Репозиторий %s создан" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "Репозитарий %s успешно обновлён" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "Произошла ошибка во время обновления репозитория %s" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "Форки %s отсоединены" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "Удалены форки репозитория %s" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "Репозиторий %s удалён" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Невозможно удалить %s, он всё-ещё содержит форки" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "Произошла ошибка во время удаления %s" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "Привилегии репозитория обновлены" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "Произошла ошибка при создании поля" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "Произошла ошибка при удалении поля" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:526 msgid "Updated repository visibility in public journal" msgstr "Видимость репозитория в публичном журнале обновлена" -#: kallithea/controllers/admin/repos.py:526 +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "Произошла ошибка при установке репозитария в общедоступный журнал" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "Несовпадение токенов" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "Ничего" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Репозиторий %s отмечен как форк %s" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "Произошла ошибка при выполнении операции" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "Закрытый репозиторий" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "Открытый репозиторий" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "Произошла ошибка во время разблокирования" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "Разблокировано" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "Заблокировано" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "Репозиторий %s" -#: kallithea/controllers/admin/repos.py:618 +#: kallithea/controllers/admin/repos.py:622 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:622 +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "Произошла ошибка при очистке кэша" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "Внесены изменения из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "Произошла ошибка при внесении изменений из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "Произошла ошибка при удалении статистики репозитория" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "Обновлены настройки VCS" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -822,14 +897,14 @@ "Невозможно включить поддержку hgsubversion. Библиотека «hgsubversion» " "отсутствует" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, fuzzy, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s" #: kallithea/controllers/admin/settings.py:270 @@ -848,23 +923,23 @@ msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "Добавлена новая ловушка" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:418 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "произошла ошибка при создании хука" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "Запланирована переиндексация базы Whoosh" @@ -873,108 +948,116 @@ msgid "Created user group %s" msgstr "Создана группа пользователей %s" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Произошла ошибка при создании группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "Группа пользователей %s обновлена" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "Произошла ошибка при обновлении группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "Группа пользователей успешно удалена" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "Произошла ошибка при удалении группы пользователей" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "Целевая группа не может быть такой же" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "Привилегии группы пользователей обновлены" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "Обновлены привилегии" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "Произошла ошибка при сохранении привилегий" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "Пользователь %s создан" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "Произошла ошибка при создании пользователя %s" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "Пользователь успешно обновлён" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "Пользователь успешно удалён" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "Произошла ошибка при удалении пользователя" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "Вы не можете редактировать данного пользователя" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "Добавлен IP %s в белый список пользователя" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "Произошла ошибка при сохранении IP" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "Удален IP %s из белого списка пользователя" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "" "Вы должны быть зарегистрированным пользователем, чтобы выполнить это " "действие" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "Страница доступна только авторизованным пользователям" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "Набор изменений не найден" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Двоичный файл" @@ -989,163 +1072,158 @@ msgid "No changes detected" msgstr "Изменений не обнаружено" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "Удалена ветка: %s" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "Создан тег: %s" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "Набор изменений не найден" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Показать отличия вместе %s->%s" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "сравнение" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "и" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "на %s больше" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "версии" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "имя форка %s" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "Pull-запрос #%s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:771 msgid "[deleted] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 msgid "[created] repository" msgstr "[создан] репозиторий" -#: kallithea/lib/helpers.py:747 +#: kallithea/lib/helpers.py:775 msgid "[created] repository as fork" msgstr "[создан] репозиторий как форк" -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 msgid "[forked] repository" msgstr "[форкнут] репозиторий" -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 msgid "[updated] repository" msgstr "[обновлён] репозиторий" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:781 msgid "[downloaded] archive from repository" msgstr "[загружен] архив из репозитория" -#: kallithea/lib/helpers.py:755 +#: kallithea/lib/helpers.py:783 msgid "[delete] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:791 msgid "[created] user" msgstr "[создан] пользователь" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:793 msgid "[updated] user" msgstr "[обновлён] пользователь" -#: kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:795 msgid "[created] user group" msgstr "[создана] группа пользователей" -#: kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:797 msgid "[updated] user group" msgstr "[обновлена] группа пользователей" -#: kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:799 msgid "[commented] on revision in repository" msgstr "[комментарий] к ревизии в репозитории" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:801 msgid "[commented] on pull request for" msgstr "[прокомментировано] в запросе на внесение изменений для" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:803 msgid "[closed] pull request for" msgstr "[закрыт] Pull-запрос для" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:805 msgid "[pushed] into" msgstr "[отправлено] в" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:807 msgid "[committed via Kallithea] into repository" msgstr "[внесены изменения с помощью Kallithea] в репозитории" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:809 msgid "[pulled from remote] into repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "[внесены изменения] из" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "[добавлен в наблюдения] репозиторий" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "[удалён из наблюдения] репозиторий" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr " и на %s больше" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "Файлов нет" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "новый файл" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "изменён" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "удалён" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "переименован" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1153,10 +1231,10 @@ "repositories" msgstr "" "Репозиторий %s отсутствует в базе данных; возможно, он был создан или " -"переименован из файловой системы. Пожалуйста, перезапустите приложение для " -"сканирования репозиториев" - -#: kallithea/lib/utils2.py:415 +"переименован из файловой системы. Пожалуйста, перезапустите приложение " +"для сканирования репозиториев" + +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1164,7 +1242,7 @@ msgstr[1] "%d лет" msgstr[2] "%d года" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1172,7 +1250,7 @@ msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1180,7 +1258,7 @@ msgstr[1] "%d дня" msgstr[2] "%d дней" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1188,7 +1266,7 @@ msgstr[1] "%d часов" msgstr[2] "%d часа" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1196,7 +1274,7 @@ msgstr[1] "%d минут" msgstr[2] "%d минуты" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1204,32 +1282,62 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунды" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "в %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "в %s и %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "%s и %s назад" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "прямо сейчас" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "Репозитарий - нет доступа" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "Репозитарий - доступ на чтение" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1239,12 +1347,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "Репозитарий - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "Репозитарий - доступ на запись" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1254,162 +1362,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" -msgstr "Репозитарий - доступ на чтение" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" +msgstr "Репозитарий - администрирование" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" -msgstr "Репозитарий - доступ на запись" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" +msgstr "Группа Репозиториев - нет доступа" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" -msgstr "Репозитарий - администрирование" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "Группа Репозиториев - доступ на чтение" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" +msgstr "Группа Репозиториев - доступ на запись" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "Группа Репозиториев - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" -msgstr "Группа Репозиториев - доступ на чтение" +msgid "Repository Group admin access" +msgstr "Группа Репозиториев - администрирование" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" -msgstr "Группа Репозиториев - доступ на запись" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" +msgstr "Администратор Kallithea" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" -msgstr "Группа Репозиториев - администрирование" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "Создание репозиториев отключено" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" +msgstr "Создание репозиториев включено" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "Администратор Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "Создание репозиториев отключено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" -msgstr "Создание репозиториев включено" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "Возможность создавать форк репозитория отключена" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "Возможность создавать форк репозитория включена" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" +msgstr "Регистрация отключена" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "Возможность создавать форк репозитория отключена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "Возможность создавать форк репозитория включена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" -msgstr "Регистрация отключена" +msgid "Register new user with Kallithea with manual activation" +msgstr "Регистрация нового пользователя в Kallithea с ручной активацией" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "Регистрация нового пользователя в Kallithea с ручной активацией" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "Регистрация нового пользователя в Kallithea с автоматической активацией" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "Не просмотрено" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "Одобрено" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1419,12 +1527,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "Не просмотрено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "Отклонено" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1434,52 +1542,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "Одобрено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "Отклонено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "На рассмотрении" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "верхний уровень" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "Группа Репозиториев - нет доступа" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "Группа репозиториев - доступ на чтение" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1488,9 +1590,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" -msgstr "Группа Репозиториев - нет доступа" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" +msgstr "Группа репозиториев - доступ на запись" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1500,23 +1602,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "Группа репозиториев - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "Группа репозиториев - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "Группа репозиториев - администрирование" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1524,9 +1613,20 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" -msgstr "Группа репозиториев - администрирование" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "Группа пользователей - нет доступа" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" +msgstr "Группа пользователей - доступ на чтение" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1535,9 +1635,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" -msgstr "Группа пользователей - нет доступа" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" +msgstr "Группа пользователей - доступ на запись" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1546,20 +1646,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "Группа пользователей - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" -msgstr "Группа пользователей - доступ на запись" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" +msgstr "Группа пользователей - администрирование" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1568,21 +1657,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "Группа пользователей - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "Создание групп репозиториев отключено" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "Создание групп репозиториев включено" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1590,32 +1679,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "Создание групп репозиториев включено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "Создание групп пользователей отключено" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "Создание групп пользователей включено" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "Регистрация отключена" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "Регистрация пользователя с ручной активацией учётной записи" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1623,48 +1723,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "Регистрация отключена" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "Регистрация пользователя с ручной активацией учётной записи" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "на строке %s" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "[Упоминание]" @@ -1690,98 +1768,147 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s оставил комментарий к набору изменений %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s отправил сообщение %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s упомянул вас %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s зарегистрировался в Kallithea %(when)s" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s открыл новый pull-запрос %(when)s" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s оставил комментарий к pull-запросу %(when)s" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, fuzzy, python-format +msgid "New user %(new_username)s registered" +msgstr "Имя \"%(username)s\" недопустимо" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +#, fuzzy +msgid "Closing" +msgstr "Используется" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "последняя версия" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "Регистрация нового пользователя" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" "Вы не можете редактировать пользователя, поскольку это критично для " "работы всего приложения" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Вы не можете удалить пользователя, поскольку это критично для работы " "всего приложения" -#: kallithea/model/user.py:276 -#, python-format +#: kallithea/model/user.py:261 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" +"пользователь \"%s\" является владельцем репозиториев %s и поэтому не " +"может быть удалён. Смените владельца или удалите данные репозитории. %s" + +#: kallithea/model/user.py:268 +#, fuzzy, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" +"пользователь \"%s\" является владельцем репозиториев %s и поэтому не " +"может быть удалён. Смените владельца или удалите данные репозитории. %s" + +#: kallithea/model/user.py:275 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" msgstr "" "пользователь \"%s\" является владельцем репозиториев %s и поэтому не " "может быть удалён. Смените владельца или удалите данные репозитории. %s" -#: kallithea/model/user.py:304 +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "Ваш новый пароль" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "Ваш новый пароль от Kallithea: %s" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "Значение не может быть пустым списком" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Пользователь с именем \"%(username)s\" уже существует" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "Имя \"%(username)s\" отклонено" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" @@ -1790,25 +1917,25 @@ "подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры " "либо с символа подчеркивания" -#: kallithea/model/validators.py:151 +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:158 +#: kallithea/model/validators.py:139 #, python-format msgid "Username %(username)s is not valid" msgstr "Имя \"%(username)s\" недопустимо" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:158 msgid "Invalid user group name" msgstr "Неверное имя группы пользователей" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Группа пользователей \"%(usergroup)s\" уже существует" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1816,108 +1943,110 @@ "имя группы пользователей может содержать только буквы, цифры, символы " "подчеркивания, точки и тире; а так же должно начинаться с буквы или цифры" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "Невозможно использовать эту группу как родителя" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Группа \"%(group_name)s\" уже существует" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Репозитарий с именем \"%(group_name)s\" уже существует" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "Недопустимые символы (не ascii) в пароле" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "Неверно задан старый пароль" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:291 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: kallithea/model/validators.py:327 +#: kallithea/model/validators.py:308 msgid "invalid password" msgstr "неверный пароль" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:309 msgid "invalid user name" msgstr "неверное имя пользователя" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:310 msgid "Your account is disabled" msgstr "Ваш аккаунт выключен" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Имя репозитория %(repo)s запрещено" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Репозитарий %(repo)s уже существует" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Репозитарий \"%(repo)s\" уже существует в группе \"%(group)s\"" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Группа репозиториев \"%(repo)s\" уже существует" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" +#: kallithea/model/validators.py:474 +#, fuzzy +msgid "invalid clone URL" msgstr "неверный URL" -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" -"Неверный адрес клонирования, предоставьте корректный адрес для клонирования " -"формата http(s)/svn+http(s)." - -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:475 +#, fuzzy +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +msgstr "" +"Неверный адрес клонирования, предоставьте корректный адрес для " +"клонирования формата http(s)/svn+http(s)." + +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "Тип форка будет совпадать с родительским" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "У вас недостаточно прав для создания репозиториев в этой группе" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "недостаточно прав для создания репозитория в корневом каталоге" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "У Вас недостаточно привилегий для создания группы в этом месте" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "Данное имя пользователя или группы пользователей недопустимо" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "Этот путь ошибочен" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "Этот E-mail уже занят" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "\"%(email)s\" не существует." -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1925,40 +2054,40 @@ "Для входа по LDAP должно быть указано значение аттрибута CN - это " "эквивалент имени пользователя" -#: kallithea/model/validators.py:804 +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" "Ревизии %(revs)s уже включены в pull-request или имеют установленный " "статус" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "Пожалуйста, введите существующий IPv4 или IpV6 адре" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - " "неверно)" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Ключевое имя может только состоять из букв, символа подчеркивания, тире " "или чисел" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "Файла нет в каталоге" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1969,35 +2098,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "фильтр..." #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "репозитории" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "Добавить репозиторий" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "Добавить группу репозиториев" @@ -2014,164 +2144,165 @@ msgstr "Имя группы" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "Описание" -#: kallithea/templates/index_base.html:126 +#: kallithea/templates/index_base.html:129 #: kallithea/templates/admin/my_account/my_account_repos.html:46 #: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 #: kallithea/templates/admin/repos/repo_add_base.html:9 #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 #: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks.html:49 #: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 +#: kallithea/templates/branches/branches.html:49 #: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 #: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "Имя" -#: kallithea/templates/index_base.html:129 +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "Последнее изменение" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "Состояние" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "Владелец" -#: kallithea/templates/index_base.html:141 +#: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "По возрастанию" -#: kallithea/templates/index_base.html:142 +#: kallithea/templates/index_base.html:145 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 msgid "Click to sort descending" msgstr "По убыванию" -#: kallithea/templates/index_base.html:143 +#: kallithea/templates/index_base.html:146 msgid "No repositories found." msgstr "Репозитарии не найдены." -#: kallithea/templates/index_base.html:144 +#: kallithea/templates/index_base.html:147 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 msgid "Data error." msgstr "Ошибка данных." -#: kallithea/templates/index_base.html:145 +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "Загрузка..." -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "Войти" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "Войти в %s" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "Имя пользователя" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "Пароль" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "Запомнить" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "Войти" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "Забыли пароль?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "Нет аккаунта?" @@ -2179,78 +2310,85 @@ msgid "Password Reset" msgstr "Сброс пароля" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, fuzzy, python-format +msgid "Reset Your Password to %s" +msgstr "Забыли пароль?" + +#: kallithea/templates/password_reset.html:14 +#, fuzzy +msgid "Reset Your Password" +msgstr "Забыли пароль?" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "Почтовый адрес" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" +#: kallithea/templates/password_reset.html:46 +#, fuzzy +msgid "Send Password Reset Email" +msgstr "Ссылка сброса пароля" + +#: kallithea/templates/password_reset.html:47 +#, fuzzy +msgid "" +"Password reset link will be sent to the email address matching your " +"username." msgstr "Ссылка для сброса пароля была отправлена на соответствующий E-mail" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "Вступить" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "Повторите пароль" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "Имя" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "Фамилия" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "Ваш аккаунт будет активирован сразу после регистрации" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" -msgstr "Ваш аккаунт ожидает модерации" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." +msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "Ветки ещё не созданы" @@ -2269,25 +2407,27 @@ msgstr "Закладок ещё нет" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +#, fuzzy +msgid "Admin Journal" msgstr "Журнал администратора" -#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/admin/admin.html:10 msgid "journal filter..." msgstr "Фильтр журнала..." -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +#, fuzzy +msgid "Filter" msgstr "Отфильтровать" -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "%s запись" msgstr[1] "%s записей" msgstr[2] "%s записи" @@ -2295,13 +2435,13 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "Действие" @@ -2311,11 +2451,11 @@ msgstr "Репозитарий" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Дата" @@ -2332,20 +2472,20 @@ msgid "Authentication Settings" msgstr "Настройки аутентификации" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "Аутентификация" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "Плагины аутентификации" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" -msgstr "Плагины аутентификации" - -#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Enabled Plugins" msgstr "Включенные плагины" -#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/templates/admin/auth/auth_settings.html:33 msgid "" "Comma separated list of plugins. Order of plugins is also order in which " "Kallithea will try to authenticate user" @@ -2353,141 +2493,142 @@ "Список плагинов, разделенных запятой. Kallithea будет пробовать " "аутентифицировать пользователя в порядке указания плагинов" -#: kallithea/templates/admin/auth/auth_settings.html:37 +#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Available built-in plugins" msgstr "Доступные встроенные плагины" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "Плагин" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "Сохранить" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "Плагин" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" msgstr "Значения по умолчанию" -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "Значения по умолчанию" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "Тип" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "Приватный репозиторий" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "Приватные репозитории видны только их участникам." -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "Включить статистику" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "Включить окно статистики на странице 'Общие сведения'." -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "Включить скачивание" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "Включить меню скачивания на странице 'Общие сведения'." -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "Включить блокирование" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "Включить автоблокировку для репозитория." #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "Описание..." +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "Истекает" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2495,75 +2636,69 @@ msgid "never" msgstr "никогда" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "plain" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "Отмена" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, fuzzy, python-format +msgid "Private Gists for User %s" msgstr "Приватная запись Gist для пользователя %s" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, fuzzy, python-format +msgid "Public Gists for User %s" msgstr "Публичная запись Gist для пользователя %s" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "Публичные записи Gist" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "Создано" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "Записи Gist отсутствуют" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2571,118 +2706,114 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "Сброс" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "Gist" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "Удалить" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Редактировать" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "создал" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "Показать без форматирования" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "Мой аккаунт" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "Мой Аккаунт" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "Профиль" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" -msgstr "Профиль" +msgid "My Emails" +msgstr "Мои Email-ы" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" +msgstr "Мои репозитории" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" -msgstr "" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" +msgstr "Просмотрено" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "Мои Email-ы" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "Мои репозитории" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "Просмотрено" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "Pull-запросы" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +#, fuzzy +msgid "My Permissions" msgstr "Мои привилегии" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2753,7 +2884,6 @@ msgstr "Основной" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2774,7 +2904,8 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +#, fuzzy +msgid "No additional emails specified." msgstr "Дополнительных Email не указано" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2783,8 +2914,9 @@ msgstr "Новый E-mail" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" -msgstr "" +#, fuzzy +msgid "Change Your Account Password" +msgstr "Ваш новый пароль" #: kallithea/templates/admin/my_account/my_account_password.html:7 msgid "Current password" @@ -2799,115 +2931,77 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "Измените аватар через сайт" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/my_account/my_account_profile.html:12 #: kallithea/templates/admin/users/user_edit_profile.html:9 msgid "Using" msgstr "Используется" -#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/my_account/my_account_profile.html:14 #: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "Аватары отключены" -#: kallithea/templates/admin/my_account/my_account_profile.html:13 +#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." msgstr "Не указан email. Пожалуйста, обновите ваш email." -#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "Отображать закрытые pull-запросы" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "Открыто мной" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "Pull-запрос #%s открыт %s" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "Закрыто" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "Подтвердите удаление этого pull-request'а" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "Здесь ничего нет" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "Моё участие" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "Pull-запрос #%s открыт пользователем %s %s" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" +#, fuzzy +msgid "Repositories You Own" msgstr "Репозитории, где вы - владелец" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "Записи не найдены." #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" +#, fuzzy +msgid "Repositories You are Watching" msgstr "Репозитории, за которыми вы наблюдаете" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "Мои уведомления" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "Всё" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "Комментарии" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "Pull-запросы" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +#, fuzzy +msgid "Mark All Read" msgstr "Пометить прочтённым" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2915,38 +3009,41 @@ msgstr "Уведомлений нет" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" +#: kallithea/templates/admin/notifications/show_notification.html:11 +#, fuzzy +msgid "Show Notification" msgstr "Показать уведомление" -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "Уведомления" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" +#, fuzzy +msgid "Permissions Administration" msgstr "Управление привилегиями" -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "Привилегии" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +#, fuzzy +msgid "IP Whitelist" msgstr "Белый список IP" -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "Обзор" @@ -2957,8 +3054,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2967,8 +3064,9 @@ "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -"Выбранные привилегии будут установлены по умолчанию для каждого репозитория. " -"Учтите, что ранее установленные привилегии по умолчанию будут сброшены" +"Выбранные привилегии будут установлены по умолчанию для каждого " +"репозитория. Учтите, что ранее установленные привилегии по умолчанию " +"будут сброшены" #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/permissions/permissions_globals.html:40 @@ -2980,7 +3078,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "Группа репозиториев" @@ -2991,8 +3089,8 @@ "will be lost" msgstr "" "Выбранные привилегии будут установлены по умолчанию для каждой группы " -"репозиториев. Учтите, что ранее установленные привилегии по умолчанию для " -"групп репозиториев будут сброшены" +"репозиториев. Учтите, что ранее установленные привилегии по умолчанию для" +" групп репозиториев будут сброшены" #: kallithea/templates/admin/permissions/permissions_globals.html:46 #: kallithea/templates/data_table/_dt_elements.html:211 @@ -3006,8 +3104,8 @@ "will be lost" msgstr "" "Выбранные привилегии будут установлены по умолчанию для каждой группы " -"пользователей. Учтите, что ранее установленные привилегии по умолчанию для " -"групп пользователей будут сброшены" +"пользователей. Учтите, что ранее установленные привилегии по умолчанию " +"для групп пользователей будут сброшены" #: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation" @@ -3019,8 +3117,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3040,7 +3138,8 @@ msgstr "Активация сторонней учетной записи" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +#, fuzzy +msgid "Default IP Whitelist for All Users" msgstr "Белый список IP для всех пользователей" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -3051,7 +3150,8 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +#, fuzzy +msgid "All IP addresses are allowed." msgstr "Разрешены любые IP-адреса" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -3060,68 +3160,64 @@ msgstr "Новый ip-адрес" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" +#, fuzzy +msgid "Default User Permissions Overview" msgstr "Обзор прав пользователей по-умолчанию" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "Добавить группу репозиториев" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" msgstr "Группы репозиториев" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "Имя группы" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Родительская группа" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" +#, fuzzy, python-format +msgid "%s Repository Group Settings" msgstr "Группы репозиториев" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "Добавить подгруппу" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "Настройки" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "Дополнительно" @@ -3145,7 +3241,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "Создано" @@ -3247,57 +3343,63 @@ "Включить lock-by-pulling для группы. Эта опция будет применена ко всем " "дочерним группам и репозиториям" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Remove this group" +msgstr "Создавать группы пользователей" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "Подтвердите удаление следующей группы пользователей: %s" + #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "Домой" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "с" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" +#, fuzzy +msgid "Repository Groups Administration" msgstr "Администрирование групп репозиториев" -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#, fuzzy +msgid "Number of Top-level Repositories" msgstr "Число репозиториев верхнего уровня" -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" -msgstr "Добавить репозиторий" - #: kallithea/templates/admin/repos/repo_add_base.html:14 msgid "Import existing repository ?" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "Клонировать из" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +#, fuzzy +msgid "Optional URL from which repository should be cloned." msgstr "Опциональный url http[s], с которого требуется склонировать репозиторий." #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 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:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "Опционально выбрать группу, в которую поместить данный репозиторий." #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3306,7 +3408,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "Ревизия для выгрузки" @@ -3317,170 +3419,182 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +#, fuzzy, python-format +msgid "%s Creating Repository" +msgstr "Произошла ошибка при создании репозитория %s" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" -msgstr "" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "Использовать дополнительные поля в репозиториях" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +#, fuzzy +msgid "Extra Fields" +msgstr "Дополнительные поля" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" -msgstr "Дополнительные поля" +msgid "Caches" +msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "Удалённый" -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "Статистика" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "Форк от" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +#, fuzzy +msgid "Parent" +msgstr "Родительская группа" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "Набор" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" +#, fuzzy +msgid "Manually set this repository as a fork of another from the list." msgstr "Вручную сделать этот репозиторий форком выбранного из списка" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#, fuzzy +msgid "Public Journal Visibility" +msgstr "общедоступный журнал" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "Удалить из общедоступного журнала" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +#, fuzzy +msgid "Add to Public Journal" msgstr "Добавить в общедоступный журнал" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 +#, fuzzy msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" +"All actions done in this repository will be visible to everyone in the " +"public journal." msgstr "" "Все производимые с этим репозиторием действия будут отображаться в " "общедостпном журнале" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +#, fuzzy +msgid "Change Locking" +msgstr "Включить блокирование" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +#, fuzzy +msgid "Confirm to unlock repository." msgstr "Подтвердите снятие блокировки с репозитория" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "Открытый репозиторий" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." msgstr "Подтвердите блокировку репозитория" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "Открытый репозиторий" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "Репозиторий не заблокирован" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Подтвердите удаление этого репозитория: %s" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "[удален] репозиторий" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "данный репозиторий имеет %s копию" msgstr[1] "данный репозиторий имеет %s копии" msgstr[2] "данный репозиторий имеет %s копий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "Отсоединить fork'и" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "Удалить fork'и" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" -msgstr "" -"Этот репозитарий будет переименован таким образом, чтобы сделать его " -"недоступным для Kallithea и систем управления версиями. Если вам " -"необходимо полностью удалить его из файловой системы, пожалуйста, " -"сделайте это вручную" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +#, fuzzy +msgid "Invalidate Repository Cache" msgstr "Сбросить кэш репозитория" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +#, fuzzy +msgid "Confirm to invalidate repository cache." msgstr "Подтвердите сброс кэша" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#, fuzzy msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "Ручной сброс кэша репозитория. При первом доступе кэш восстановится" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +#, fuzzy +msgid "List of Cached Values" msgstr "Список кешированных значений" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3493,12 +3607,12 @@ msgstr "Ключ" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "Активный" @@ -3532,27 +3646,31 @@ msgstr "Введите описание поля" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" -msgstr "" +#, fuzzy +msgid "Extra fields are disabled." +msgstr "Аватары отключены" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "private repository" msgstr "приватный репозиторий" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" -msgstr "" +#, fuzzy +msgid "Remote URL" +msgstr "Ссылка для клонирования" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +#, fuzzy +msgid "Pull Changes from Remote Location" msgstr "Получить изменения с удалённой стороны" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +#, fuzzy +msgid "Confirm to pull changes from remote side." msgstr "Подтвердите скачивание изменений" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3560,7 +3678,7 @@ msgstr "Неизменяемый id" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3570,16 +3688,18 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" -msgstr "URI для клонирования" +#: kallithea/templates/summary/summary.html:72 +#, fuzzy +msgid "Clone URL" +msgstr "Ссылка для клонирования" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 #: kallithea/templates/base/perms_summary.html:43 @@ -3599,15 +3719,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." -msgstr "Опционально выбрать группу, в которую поместить данный репозиторий." +msgid "URL used for doing remote pulls." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " @@ -3626,47 +3741,51 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" -msgstr "" +#, fuzzy +msgid "Reset Statistics" +msgstr "Включить статистику" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +#, fuzzy +msgid "Confirm to remove current statistics." msgstr "Подтвердите сброс статистики" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" +#, fuzzy +msgid "Repositories Administration" msgstr "Администрирование репозиториев" -#: kallithea/templates/admin/repos/repos.html:54 +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" +#, fuzzy +msgid "Settings Administration" msgstr "Администрирование настроек" -#: kallithea/templates/admin/settings/settings.html:40 +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "Хуки" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3735,35 +3854,42 @@ msgstr "Приветствие для HTTP-аутентификации" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "Код Google Analytics" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" msgstr "Сохранить настройки" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3773,10 +3899,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" +#, fuzzy +msgid "Custom Hooks" msgstr "Пользовательские хуки" -#: kallithea/templates/admin/settings/settings_hooks.html:69 +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "Не удалось удалить хук" @@ -3790,9 +3917,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3800,19 +3926,18 @@ msgstr "Сбросить кэш для всех репозиториев" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." -msgstr "" +#, fuzzy +msgid "Check this to reload data and clear cache keys for all repositories." +msgstr "Сбросить кэш для всех репозиториев" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3829,7 +3954,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3854,11 +3979,12 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" -msgstr "" +#, fuzzy +msgid "Git version" +msgstr "Изменить привилегии" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3866,7 +3992,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3874,7 +4000,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3887,8 +4013,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3908,7 +4034,8 @@ msgstr "Обновлять репозиторий после отправки (hg update)" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +#, fuzzy +msgid "Mercurial extensions" msgstr "Расширения Mercurial" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3921,13 +4048,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "Расположение репозитариев" +#, fuzzy +msgid "Location of repositories" +msgstr "Создать репозитории" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" @@ -3939,8 +4067,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3969,8 +4097,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3986,8 +4114,10 @@ #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -4000,71 +4130,73 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "Элементы панели" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "Иконки" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "Показывать иконки публичных репозиториев" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "Показывать иконки приватных репозиториев" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +#, fuzzy +msgid "Show public/private icons next to repository names." +msgstr "Показывать иконки публичных репозиториев" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "Метатегирование" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Добавить группу пользователей" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "Группы пользователей" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -4074,19 +4206,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "Стандартные привилегии" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "Участники" @@ -4105,7 +4232,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "Нет участников" @@ -4113,23 +4240,16 @@ msgid "Chosen group members" msgstr "Выбранные участники группы" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "Удалить всё" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "Доступные участники" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "Добавить всё" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" +#, fuzzy +msgid "User Groups Administration" msgstr "Администрирование групп пользователей" -#: kallithea/templates/admin/user_groups/user_groups.html:13 +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4137,18 +4257,19 @@ msgid "Add user" msgstr "Добавить пользователя" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "Пользователи" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "Подтверждение пароля" @@ -4157,14 +4278,15 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +msgid "Default Permissions" +msgstr "Стандартные привилегии" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4176,6 +4298,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4222,193 +4345,192 @@ msgstr "Подтвердите новый пароль" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" +#, fuzzy +msgid "Users Administration" msgstr "Администрирование пользователей" -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "пользователи" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "Имя" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" -msgstr "Фамилия" - #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "Последний вход" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "Экземпляр сервера: %s" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +#, fuzzy +msgid "Create Fork" +msgstr "Удалить fork'и" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "Общие сведения" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "История изменений" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Файлы" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "Переключиться на" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 msgid "Options" msgstr "Опции" -#: kallithea/templates/base/base.html:166 +#: kallithea/templates/base/base.html:158 #: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +#, fuzzy +msgid "Compare Fork" msgstr "Сравнить форк" -#: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 +#: kallithea/templates/branches/branches.html:56 #: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 +#: kallithea/templates/tags/tags.html:56 #: kallithea/templates/tags/tags_data.html:13 msgid "Compare" msgstr "Сравнить" -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Поиск" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:166 msgid "Unlock" msgstr "Разблокировать" +#: kallithea/templates/base/base.html:168 +msgid "Lock" +msgstr "Заблокировать" + #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "Заблокировать" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "Наблюдать" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "Не наблюдать" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "Показать pull-запросы для %s" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "Не авторизован" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "Авторизоваться" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "Забыли пароль?" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "Выход" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "Показать последнюю активность" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Журнал" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "Общедоступный журнал" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "Показать публичные записи" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "Gist" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "Создать новую запись" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" +#: kallithea/templates/base/base.html:241 +#, fuzzy +msgid "All Public Gists" msgstr "Все публичные записи" -#: kallithea/templates/base/base.html:330 -msgid "My public gists" +#: kallithea/templates/base/base.html:243 +#, fuzzy +msgid "My Public Gists" msgstr "Мои публичные записи" -#: kallithea/templates/base/base.html:331 -msgid "My private gists" +#: kallithea/templates/base/base.html:244 +#, fuzzy +msgid "My Private Gists" msgstr "Мои приватные записи" -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "Поиск по репозиториям" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#, fuzzy +msgid "My Pull Requests" +msgstr "Pull-запросы" + +#: kallithea/templates/base/base.html:292 +#, fuzzy +msgid "Not Logged In" +msgstr "Не авторизован" + +#: kallithea/templates/base/base.html:299 +#, fuzzy +msgid "Login to Your Account" +msgstr "Авторизоваться" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "Забыли пароль?" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "Выход" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4471,112 +4593,123 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" msgstr "Добавить другой комментарий" -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "Отменить наблюдение за репозиторием" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "Наблюдать за репозиторием" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "Группа" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "участники" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "Загрузка..." -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "загрузка..." -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "Поиск усечен" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "Нет совпадений" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +#, fuzzy +msgid "Open New Pull Request" msgstr "Создать новый pull запрос" -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" +#: kallithea/templates/base/root.html:32 +#, fuzzy +msgid "Open New Pull Request for Selected Changesets" msgstr "Открыть новый pull-request для выделенных наборов изменений" -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" +#: kallithea/templates/base/root.html:33 +#, fuzzy +msgid "Show Selected Changesets __S → __E" msgstr "Показать выбранные наборы изменений: __S -> __E" -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" +#: kallithea/templates/base/root.html:34 +#, fuzzy +msgid "Show Selected Changeset __S" msgstr "Показать выбранный набор изменений: __S" -#: kallithea/templates/base/root.html:58 -msgid "Selection link" +#: kallithea/templates/base/root.html:35 +#, fuzzy +msgid "Selection Link" msgstr "Ссылка выбора" -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +#, fuzzy +msgid "Collapse Diff" msgstr "Свернуть сравнение" -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" +#: kallithea/templates/base/root.html:37 +#, fuzzy +msgid "Expand Diff" msgstr "Раскрыть сравнение" -#: kallithea/templates/base/root.html:61 +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "Не удалось отозвать привилегии" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/base/root.html:39 +#, fuzzy +msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "подтвердите удаление привилегии для {0}: {1} ?" -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" -msgstr "" +#: kallithea/templates/base/root.html:43 +#, fuzzy +msgid "Specify changeset" +msgstr "Выбрать набор изменений" #: kallithea/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "Закладки %s" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "Автор" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "Ревизия" @@ -4586,7 +4719,7 @@ msgid "%s Branches" msgstr "Ветки %s" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4603,27 +4736,38 @@ msgstr[1] "Показаны %d из %d ревизий" msgstr[2] "Показаны %d из %d ревизий" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "Показать" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "Очистить выбор" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "Подтвердите блокировку репозитория" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "Сравнить fork с %s" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "Показать" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, fuzzy, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "Сравнить fork с %s" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +#, fuzzy +msgid "Branch filter:" +msgstr "Отфильтровать" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" @@ -4632,142 +4776,273 @@ "Статус набора изенений: %s⏎\n" "Кликрните, чтобы перейти к соответствующему pull-request'у #%s" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "Статус набора изменений: %s" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 +#: kallithea/templates/changelog/changelog.html:124 +#: kallithea/templates/compare/compare_cs.html:30 msgid "Changeset has comments" msgstr "Комментарии отсутствуют" -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "Закладка %s" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "Метка %s" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "Ветка %s" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "Изменений ещё нет" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "Удалено" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "Изменено" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "Добавлено" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "Затрагивает %s файлов" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "Сообщение commit'а" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 msgid "Age" msgstr "Возраст" -#: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "Ссылки" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "Добавить или загрузить файлы через Kallithea" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "Отправить новый репозиторий" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "Существующий репозиторий?" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s Изменения" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "Статут изменений" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "Отобразить в формате diff" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "Применить разностное исправление (Patch diff)" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "Скачать diff" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 +msgid "merge" +msgstr "свести" + +#: kallithea/templates/changeset/changeset.html:123 +#, fuzzy +msgid "Grafted from:" +msgstr "Создано" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 +#, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "%s файл изменён" +msgstr[1] "%s файлов изменено" +msgstr[2] "%s файла изменено" + +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "%s файл изменён: %s добавление, %s удаление" +msgstr[1] "%s файла изменёно: %s добавления, %s удаления" +msgstr[2] "%s файлов изменёно: %s добавлений, %s удалений" + +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +#, fuzzy +msgid "Show full diff anyway" +msgstr "Показать полный diff" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 +msgid "no revisions" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "Изменение статуса -> %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:25 +#: kallithea/templates/changeset/changeset_file_comment.html:28 +#, fuzzy +msgid "No title" +msgstr "новый файл" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +#, fuzzy +msgid "Comment from pull request" +msgstr "Комментарий в Pull запросе #%s" + +#: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 +msgid "Comment on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" +msgstr "%d комментарий" + +#: kallithea/templates/changeset/changeset_file_comment.html:67 +msgid "Commenting on line {1}." +msgstr "Комментарий к строке {1}." + +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 +#, python-format +msgid "Comments parsed using %s syntax with %s support." +msgstr "" +"Парсинг комментариев выполнен с использованием синтаксиса %s с поддержкой" +" %s." + +#: kallithea/templates/changeset/changeset_file_comment.html:70 +#, fuzzy +msgid "Use @username inside this text to notify another user" +msgstr "" +"Используйте @имя_пользователя в тексте, чтобы отправить оповещение " +"указанному пользователю Kallithea" + +#: kallithea/templates/changeset/changeset_file_comment.html:80 +#: kallithea/templates/changeset/changeset_file_comment.html:199 +msgid "Comment preview" +msgstr "Предварительный просмотр комментария" + +#: kallithea/templates/changeset/changeset_file_comment.html:85 +#, fuzzy +msgid "Submitting ..." +msgstr "Применение..." + +#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:205 +msgid "Comment" +msgstr "Комментировать" + +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "Предпросмотр" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 +msgid "You need to be logged in to comment." +msgstr "Вам необходимо авторизоваться, чтобы оставлять комментарии." + +#: kallithea/templates/changeset/changeset_file_comment.html:98 +msgid "Login now" +msgstr "Авторизоваться сейчас" + +#: kallithea/templates/changeset/changeset_file_comment.html:102 +msgid "Hide" +msgstr "Скрыть" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -4775,160 +5050,65 @@ msgstr[1] "%d комментария" msgstr[2] "%d комментариев" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" msgstr[0] "(%d к строке)" msgstr[1] "(%d к строкам)" msgstr[2] "(%d к строкам)" -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 -msgid "merge" -msgstr "свести" - -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 -#, python-format -msgid "%s file changed" -msgid_plural "%s files changed" -msgstr[0] "%s файл изменён" -msgstr[1] "%s файлов изменено" -msgstr[2] "%s файла изменено" - -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 -#, python-format -msgid "%s file changed with %s insertions and %s deletions" -msgid_plural "%s files changed with %s insertions and %s deletions" -msgstr[0] "%s файл изменён: %s добавление, %s удаление" -msgstr[1] "%s файла изменёно: %s добавления, %s удаления" -msgstr[2] "%s файлов изменёно: %s добавлений, %s удалений" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "Отображение слишком большого diff'а может занять длительное время" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "Показать полный diff" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 -msgid "no revisions" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "Комментарий в Pull запросе #%s" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:32 -msgid "Comment on changeset" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "Применение..." - -#: kallithea/templates/changeset/changeset_file_comment.html:66 -msgid "Commenting on line {1}." -msgstr "Комментарий к строке {1}." - -#: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" -"Парсинг комментариев выполнен с использованием синтаксиса %s с поддержкой" -" %s." - -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, fuzzy, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "Главное" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +#, fuzzy +msgid "Use @username inside this text to send notification to another local user." msgstr "" "Используйте @имя_пользователя в тексте, чтобы отправить оповещение " "указанному пользователю Kallithea" -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" -msgstr "Предпросмотр" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 -msgid "Comment preview" -msgstr "Предварительный просмотр комментария" - -#: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 -msgid "Comment" -msgstr "Комментировать" - -#: kallithea/templates/changeset/changeset_file_comment.html:96 -msgid "You need to be logged in to comment." -msgstr "Вам необходимо авторизоваться, чтобы оставлять комментарии." - -#: kallithea/templates/changeset/changeset_file_comment.html:96 -msgid "Login now" -msgstr "Авторизоваться сейчас" - -#: kallithea/templates/changeset/changeset_file_comment.html:100 -msgid "Hide" -msgstr "Скрыть" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" msgstr "Изменить статус ревизии" -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "Закрыть (когда одобрен или отклонен)" +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "Без изменений" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(закрыто)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s Изменения" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "Затронутые файлы" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "Показать полный diff для этого файла" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "Показать полный diff для этого файла" @@ -4936,13 +5116,15 @@ msgid "Show inline comments" msgstr "Показать комментарии в строках" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "Показать последнюю версию файла в данном репозитории" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" -msgstr "Показать исходную версию файла в данном репозитории" +#: kallithea/templates/changeset/diff_block.html:87 +#, fuzzy +msgid "Deleted" +msgstr "удалить" + +#: kallithea/templates/changeset/diff_block.html:90 +#, fuzzy +msgid "Renamed" +msgstr "переименован" #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -4952,30 +5134,57 @@ msgid "Ancestor" msgstr "Предок" +#: kallithea/templates/compare/compare_cs.html:61 +#, fuzzy +msgid "Show merge diff" +msgstr "Показать полный diff" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +#, fuzzy +msgid "Common ancestor" +msgstr "Предок" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +#, fuzzy +msgid "is" +msgstr "Gist" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "%s Изменения" + +#: kallithea/templates/compare/compare_cs.html:85 +#, fuzzy +msgid "behind" +msgstr "Перестроить индекс" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "%s Сравнить" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "Сравнить ревизии" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4984,38 +5193,43 @@ msgstr[2] "Показать %s commit'ов" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "Нет файлов" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "Показать полный diff" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "Репозиторий Mercurial" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "Git репозиторий" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "Публичный репозиторий" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "Изменений ещё не было" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "Подписаться на ленту RSS %s" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "Подписаться на ленту Atom %s" @@ -5024,29 +5238,34 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, fuzzy, python-format +msgid "Comment from %s on %s changeset %s" msgstr "прокомментирован %s в наборе изменений %s." -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "Состояние набора изменений изменено на" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." -msgstr "Это уведомление от Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" msgstr "Здравствуйте, %s" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "Мы отправили запрос на создание нового пароля для вашего аккаунта." -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "Вы можете заново сгенерировать его, перейдя по следующей ссылке" @@ -5056,68 +5275,52 @@ "Пожалуйста, проигнорируйте данное сообщение, если вы не запрашивали новый" " пароль." -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "" -"%s открыл pull-request для репозитория %s и просит вас просмотреть изменения." - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "Заголовок" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:5 +#, fuzzy, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%s оставил комментарий к pull-запросу \"%s\"" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, fuzzy, python-format +msgid "%s requested your review of %s pull request \"%s\"" msgstr "%s оставил комментарий к pull-запросу \"%s\"" -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "%s оставил комментарий к pull-запросу \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "%s оставил комментарий к pull-запросу \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +#, fuzzy +msgid "The comment was made with status" msgstr "Pull-request был закрыт со статусом" -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" -msgstr "Статус pull-request'а был изменен" - #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "Подробнее о пользователе" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "Вы будете посланы на %s через %s секунд" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "Сравнение файлов" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "игнорировать пробелы" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "включить режим редактирования" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "Сравнение файла %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "%s Файлы" @@ -5127,85 +5330,84 @@ msgid "%s Files Add" msgstr "%s Файлов добавлено" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "Добавить файл" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Расположение" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "или" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "Режим нового файла" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" msgstr "Применить изменения" -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "Предыдущая ревизия" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "Следующая ревизия" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "Отслеживать данную ветку" -#: kallithea/templates/files/files_browser.html:25 +#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:29 +#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "Загружается список файлов..." -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "Размер" -#: kallithea/templates/files/files_browser.html:43 +#: kallithea/templates/files/files_browser.html:62 msgid "Mimetype" msgstr "Тип файла" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "Последняя версия" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" +#: kallithea/templates/files/files_browser.html:64 +#, fuzzy +msgid "Last Modified" msgstr "Последнее изменение" -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:65 +#, fuzzy +msgid "Last Committer" msgstr "Автор последнего commit'а" #: kallithea/templates/files/files_delete.html:4 @@ -5213,8 +5415,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5223,32 +5425,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "Редактировать файл" -#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_edit.html:48 #: kallithea/templates/files/files_source.html:32 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:55 +#: kallithea/templates/files/files_edit.html:50 #: kallithea/templates/files/files_source.html:35 msgid "Download as Raw" msgstr "" -#: kallithea/templates/files/files_edit.html:58 +#: kallithea/templates/files/files_edit.html:53 msgid "Source" msgstr "Исходный код" -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_edit.html:58 msgid "Editing file" msgstr "Редактирование файла" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5294,12 +5492,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "Бинарный файл (%s)" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "Файл слишком большой для отображения" @@ -5320,9 +5518,9 @@ msgid "%s Followers" msgstr "%s Наблюдатели" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "Наблюдатели" @@ -5335,31 +5533,38 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "Имя форка" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +#, fuzzy +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" +"Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " +"скачивании" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "Приватный" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "Скопировать привилегии" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "Скопировать привилегии с форкнутого репозитория" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "Обновлять после клонирования" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "Скачивать исходники после создания клона" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5368,9 +5573,9 @@ msgid "%s Forks" msgstr "Форки %s" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "Ответвления" @@ -5378,102 +5583,164 @@ msgid "Forked" msgstr "Форкнуто" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "Форки ещё не созданы" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "Лента журнала ATOM" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "Лента журнала RSS" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" msgstr "Мои репозитории" -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "Записи отсуствуют" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Публичный журнал" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "Общая лента журнала ATOM" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "Общая лента журнала RSS" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" +#, fuzzy +msgid "New Pull Request" msgstr "Новый pull запрос" -#: kallithea/templates/pullrequests/pullrequest.html:44 +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "Заголовок" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "Написать короткое писание по этому запросу" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "Поток изменений" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "Первоначальный репозиторий" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "Рецензенты запросов на внесение изменений Pull request" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "владелец" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "Добавить рецензента в данный запрос на внесение изменений." - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "Детальное сравнение" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "Репозиторий назначения" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +#, fuzzy +msgid "Pull Request Reviewers" +msgstr "Рецензенты запросов на внесение изменений Pull request" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +#, fuzzy +msgid "No entries" +msgstr "Записи отсуствуют" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, fuzzy, python-format +msgid "Latest vote: %s" +msgstr "последняя версия" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +#, fuzzy +msgid "Delete Pull Request" +msgstr "Новый pull запрос" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "Подтвердите удаление этого pull-request'а" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "Закрыто" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "%s Pull-запрос #%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "Состояние рассмотрения" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, fuzzy, python-format +msgid "Pull request #%s from %s#%s" +msgstr "Pull запросы от %s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#, fuzzy +msgid "Summarize the changes" +msgstr "Применить изменения" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "Еще не рассмотренный" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5481,92 +5748,162 @@ msgstr[1] "%d рецензента" msgstr[2] "%d рецензентов" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "Запрос на внесение изменений был рассмотрен всеми рецензентами" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "Ветки ещё не созданы" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#, fuzzy +msgid "on" +msgstr "ничего" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 #, fuzzy msgid "Pull changes" msgstr "Pull изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +#, fuzzy +msgid "Created by" +msgstr "создал" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +msgid "Update" +msgstr "[обновлён] пользователь" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "владелец" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "рецензент" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "Добавить или удалить рецензента данного запроса на внесение изменений." - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "рецензент" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "Предварительный просмотр комментария" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "Сохранить изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" -msgstr "Сравнение" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +#, fuzzy +msgid "Save as New Pull Request" +msgstr "Создать новый pull запрос" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "Последние изменения" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +#, fuzzy +msgid "Pull Request Content" +msgstr "Статус pull-request'а был изменен" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" msgstr "%s Запросы на внесение изменений" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, fuzzy, python-format +msgid "Pull Requests from %s'" msgstr "Pull запросы от %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, fuzzy, python-format +msgid "Pull Requests to '%s'" +msgstr "Pull-запросы для %s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, fuzzy, python-format +msgid "Show Pull Requests to %s" msgstr "Pull-запросы для %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "Скрыть закрытые pull запросы" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, fuzzy, python-format +msgid "Show Pull Requests from '%s'" +msgstr "Pull запросы от %s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +#, fuzzy +msgid "Show closed pull requests (in addition to open pull requests)" msgstr "Показать закрытые pull-запросы" +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#, fuzzy +msgid "Pull Requests Created by Me" +msgstr "Рецензенты запросов на внесение изменений Pull request" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#, fuzzy +msgid "Pull Requests I Participate In" +msgstr "Моё участие" + #: kallithea/templates/search/search.html:6 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" +#: kallithea/templates/search/search.html:16 +#, fuzzy +msgid "Search in All Repositories" msgstr "Поиск по всем репозиториям" -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "Фраза для поиска" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "Критерий поиска" -#: kallithea/templates/search/search.html:68 +#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "Содержимое файлов" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "Сообщения коммитов" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "Имя файла" @@ -5581,67 +5918,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "ATOM лента репозитория %s" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "RSS лента репозитория %s" -#: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 msgid "Enable" msgstr "Включено" -#: kallithea/templates/summary/statistics.html:42 +#: kallithea/templates/summary/statistics.html:39 msgid "Stats gathered: " msgstr "Полученная статистика: " -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "файлы" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "Показать еще" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:389 msgid "commits" msgstr "commit'ы" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:390 msgid "files added" msgstr "файлы добавлены" +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "файлы изменены" + +#: kallithea/templates/summary/statistics.html:392 +msgid "files removed" +msgstr "файлы удалены" + #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" -msgstr "файлы изменены" +msgid "commit" +msgstr "commit" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" -msgstr "файлы удалены" +msgid "file added" +msgstr "файл удалён" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" +msgstr "файл изменён" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "commit" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "файл удалён" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "файл изменён" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "файл удалён" @@ -5650,78 +5987,80 @@ msgid "%s Summary" msgstr "%s общие сведения" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "Репозитарий заблокирован %s" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "Репозиторий разблокирован" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "Ссылка для клонирования" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "Форк от" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "Показать по имени" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "Показать по ID" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "Популярные файлы" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:111 msgid "Download" msgstr "Скачать" -#: kallithea/templates/summary/summary.html:119 +#: kallithea/templates/summary/summary.html:115 msgid "There are no downloads yet" msgstr "Скачиваний ещё нет" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "Скачивание отключено в этом репозитории" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "Скачать в zip" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "Отметьте для скачивания архива с дочерними репозиториями" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "с дочерними репозиториями" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "Размер репозитория" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "Лента новостей" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" msgstr "Последние изменения" -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" +#: kallithea/templates/summary/summary.html:191 +#, fuzzy +msgid "Quick Start" msgstr "Быстрый старт" -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "Скачать %s как %s" @@ -5731,6 +6070,8 @@ msgid "%s Tags" msgstr "%s Меток" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" +#: kallithea/templates/tags/tags.html:26 +#, fuzzy +msgid "Compare Tags" msgstr "Сравнить метки" +
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -1,13 +1,13 @@ -# Translations template for Kallithea. +# Slovak translations for Kallithea. # Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. # Automatically generated, 2014. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 2.2.5\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2015-03-13 14:24+0200\n" "Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Slovak " @@ -17,79 +17,80 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.3-dev\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "Zatiaľ nie sú žiadne zmeny" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "Všetky vetvy" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(zatvorené)" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "Ukázať medzery" -#: kallithea/controllers/changeset.py:94 -#: kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorovať medzery" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "Taká revízia neexistuje" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "Zmena stavu -> %s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "" + +#: kallithea/controllers/changeset.py:382 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" - -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +"Changing status on a changeset associated with a closed pull request is " +"not allowed" +msgstr "" + +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "Hlavná stránka" +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:99 +msgid "Unauthorized access to resource" +msgstr "" #: kallithea/controllers/error.py:101 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:104 -msgid "Unauthorized access to resource" -msgstr "" - -#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "Nemáte oprávnenie na zobrazenie tejto stránky" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -106,12 +107,12 @@ msgstr "" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "" @@ -129,215 +130,286 @@ msgid "There are no files yet. %s" msgstr "Zatiaľ nie sú žiadne súbory. %s" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, python-format +msgid "%s at %s" +msgstr "" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, 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:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Zmazaný súbor %s cez Kallithea" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "Došlo k chybe pri ukladaní" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "Žiadne zmeny" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "Pridaný súbor cez Kallithea" -#: kallithea/controllers/files.py:461 -msgid "No content" -msgstr "Žiadny obsah" - #: kallithea/controllers/files.py:465 +msgid "No content" +msgstr "Žiadny obsah" + +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "Sťahovanie vypnuté" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Neznáma revízia %s" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "Prázdny repozitár" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "Zmeny" -#: kallithea/controllers/files.py:776 -#: kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Vetvy" -#: kallithea/controllers/files.py:777 -#: kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tagy" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Repozitáre" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "zlá captcha" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" -"Your password reset was successful, new password has been sent to your email" -msgstr "" - -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" -msgstr "" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" + +#: kallithea/controllers/pullrequests.py:130 +#, fuzzy, python-format +msgid "%s (closed)" +msgstr "(zatvorené)" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +msgid "Pull request update created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:503 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "" - -#: kallithea/controllers/pullrequests.py:522 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +msgid "Closing." msgstr "" #: kallithea/controllers/search.py:135 @@ -349,23 +421,25 @@ msgstr "" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" -msgstr "" - -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" -msgstr "" - -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#, fuzzy +msgid "An error occurred during search operation." +msgstr "Došlo k chybe pri vytváraní gist" + +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +msgid "No data ready yet" +msgstr "" + +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" @@ -373,68 +447,68 @@ msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" -msgstr "" +msgid "5 minutes" +msgstr "5 minút" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" -msgstr "5 minút" +msgid "1 hour" +msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" -msgstr "1 hodina" +msgid "1 day" +msgstr "1 deň" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "1 deň" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "1 mesiac" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "Došlo k chybe pri vytváraní gist" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "Došlo k chybe pri aktualizácii gist %s" @@ -443,62 +517,55 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "Úspešne aktualizované heslo" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 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:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "Došlo k chybe pri ukladaní e-mailovej adresy" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -514,28 +581,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "" @@ -557,26 +624,26 @@ msgstr "" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "" @@ -592,21 +659,21 @@ msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "" @@ -636,182 +703,182 @@ msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 -msgid "Updated repository visibility in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:526 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "Nič" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:618 -msgid "Cache invalidation successful" -msgstr "" - #: kallithea/controllers/admin/repos.py:622 +msgid "Cache invalidation successful" +msgstr "" + +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" #: kallithea/controllers/admin/settings.py:270 @@ -830,23 +897,23 @@ msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:414 -msgid "Updated hooks" -msgstr "" - #: kallithea/controllers/admin/settings.py:418 +msgid "Updated hooks" +msgstr "" + +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "" @@ -855,284 +922,286 @@ msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" #: kallithea/lib/diffs.py:82 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "" -#: kallithea/lib/helpers.py:743 -msgid "[deleted] repository" -msgstr "" - -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 -msgid "[created] repository" -msgstr "" - -#: kallithea/lib/helpers.py:747 -msgid "[created] repository as fork" -msgstr "" - -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 -msgid "[forked] repository" -msgstr "" - -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 -msgid "[updated] repository" -msgstr "" - -#: kallithea/lib/helpers.py:753 -msgid "[downloaded] archive from repository" -msgstr "" - -#: kallithea/lib/helpers.py:755 -msgid "[delete] repository" -msgstr "" - -#: kallithea/lib/helpers.py:763 -msgid "[created] user" -msgstr "" - -#: kallithea/lib/helpers.py:765 -msgid "[updated] user" -msgstr "" - -#: kallithea/lib/helpers.py:767 -msgid "[created] user group" -msgstr "" - -#: kallithea/lib/helpers.py:769 -msgid "[updated] user group" -msgstr "" - #: kallithea/lib/helpers.py:771 -msgid "[commented] on revision in repository" -msgstr "" - -#: kallithea/lib/helpers.py:773 -msgid "[commented] on pull request for" +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 +msgid "[created] repository" msgstr "" #: kallithea/lib/helpers.py:775 -msgid "[closed] pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:777 -msgid "[pushed] into" -msgstr "" - -#: kallithea/lib/helpers.py:779 -msgid "[committed via Kallithea] into repository" +msgid "[created] repository as fork" +msgstr "" + +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 +msgid "[forked] repository" +msgstr "" + +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 +msgid "[updated] repository" msgstr "" #: kallithea/lib/helpers.py:781 -msgid "[pulled from remote] into repository" +msgid "[downloaded] archive from repository" msgstr "" #: kallithea/lib/helpers.py:783 +msgid "[delete] repository" +msgstr "" + +#: kallithea/lib/helpers.py:791 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:793 +msgid "[updated] user" +msgstr "" + +#: kallithea/lib/helpers.py:795 +msgid "[created] user group" +msgstr "" + +#: kallithea/lib/helpers.py:797 +msgid "[updated] user group" +msgstr "" + +#: kallithea/lib/helpers.py:799 +msgid "[commented] on revision in repository" +msgstr "" + +#: kallithea/lib/helpers.py:801 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:803 +msgid "[closed] pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:805 +msgid "[pushed] into" +msgstr "" + +#: kallithea/lib/helpers.py:807 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:809 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, 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:415 +"%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:425 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1140,7 +1209,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1148,7 +1217,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1156,7 +1225,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1164,7 +1233,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1172,7 +1241,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1180,32 +1249,62 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1215,12 +1314,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1230,162 +1329,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" +msgid "Repository Group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" +msgid "Register new user with Kallithea with manual activation" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1395,12 +1494,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1410,52 +1509,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1464,8 +1557,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1476,23 +1569,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1500,8 +1580,19 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1511,8 +1602,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1522,19 +1613,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1544,21 +1624,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1566,32 +1646,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1599,49 +1690,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:77 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "" @@ -1667,254 +1735,298 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +msgid "Closing" +msgstr "" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:276 +#: kallithea/model/user.py:261 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:268 +#, 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:275 #, 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:304 +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:151 +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:139 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:158 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:177 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" +#: kallithea/model/validators.py:291 +msgid "Passwords do not match" +msgstr "" + +#: kallithea/model/validators.py:308 +msgid "invalid password" +msgstr "" + +#: kallithea/model/validators.py:309 +msgid "invalid user name" +msgstr "" + #: kallithea/model/validators.py:310 -msgid "Passwords do not match" -msgstr "" - -#: kallithea/model/validators.py:327 -msgid "invalid password" -msgstr "" - -#: kallithea/model/validators.py:328 -msgid "invalid user name" -msgstr "" - -#: kallithea/model/validators.py:329 msgid "Your account is disabled" msgstr "" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" -msgstr "" - -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" - -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:474 +msgid "invalid clone URL" +msgstr "" + +#: kallithea/model/validators.py:475 +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +msgstr "" + +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 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:804 +"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:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1925,35 +2037,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "" #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -1970,165 +2083,165 @@ msgstr "" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:126 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - #: kallithea/templates/index_base.html:129 +#: kallithea/templates/admin/my_account/my_account_repos.html:46 +#: kallithea/templates/admin/my_account/my_account_watched.html:46 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 +#: kallithea/templates/admin/repos/repo_add_base.html:9 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 +#: kallithea/templates/base/perms_summary.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:49 +#: kallithea/templates/bookmarks/bookmarks_data.html:7 +#: kallithea/templates/branches/branches.html:49 +#: kallithea/templates/branches/branches_data.html:7 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 +#: kallithea/templates/tags/tags_data.html:7 +msgid "Name" +msgstr "" + +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:143 -msgid "No repositories found." -msgstr "" - #: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 -msgid "Data error." +#: kallithea/templates/admin/my_account/my_account_repos.html:57 +#: kallithea/templates/admin/my_account/my_account_watched.html:57 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 +msgid "Click to sort ascending" msgstr "" #: kallithea/templates/index_base.html:145 +#: kallithea/templates/admin/my_account/my_account_repos.html:58 +#: kallithea/templates/admin/my_account/my_account_watched.html:58 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/index_base.html:146 +msgid "No repositories found." +msgstr "" + +#: kallithea/templates/index_base.html:147 +#: kallithea/templates/admin/my_account/my_account_repos.html:60 +#: kallithea/templates/admin/my_account/my_account_watched.html:60 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 +msgid "Data error." +msgstr "" + +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 -#: kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "" -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "" @@ -2136,78 +2249,82 @@ msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, python-format +msgid "Reset Your Password to %s" +msgstr "" + +#: kallithea/templates/password_reset.html:14 +msgid "Reset Your Password" +msgstr "" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" -msgstr "" - -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/password_reset.html:46 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +msgid "" +"Password reset link will be sent to the email address matching your " +"username." +msgstr "" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "" @@ -2226,25 +2343,25 @@ msgstr "" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +msgid "Admin Journal" +msgstr "" + +#: kallithea/templates/admin/admin.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -msgid "journal filter..." -msgstr "" - -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" -msgstr "" - -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -2252,13 +2369,13 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "" @@ -2268,11 +2385,11 @@ msgstr "" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2289,160 +2406,161 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" +msgstr "Repozitáre" + +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2450,75 +2568,69 @@ msgid "never" msgstr "" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2526,118 +2638,113 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +msgid "My Permissions" msgstr "" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2708,7 +2815,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2729,7 +2835,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2738,7 +2844,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" +msgid "Change Your Account Password" msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:7 @@ -2754,115 +2860,75 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:11 -msgid "Avatars are disabled" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:13 -msgid "Missing email, please update your user email address." +#: kallithea/templates/admin/users/user_edit_profile.html:9 +msgid "Using" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/users/user_edit_profile.html:11 +msgid "Avatars are disabled" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:15 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be managed " -"here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" +"Your user is in an external Source of Record; some details cannot be " +"managed here" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" -msgstr "" +#, fuzzy +msgid "Repositories You Own" +msgstr "Repozitáre" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" +msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +msgid "Mark All Read" msgstr "" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2870,38 +2936,38 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:11 +msgid "Show Notification" +msgstr "" + +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +msgid "Permissions Administration" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "" @@ -2912,15 +2978,15 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2933,7 +2999,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "" @@ -2966,8 +3032,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2987,7 +3053,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -2998,7 +3064,7 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +msgid "All IP addresses are allowed." msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -3007,69 +3073,63 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +msgid "Default User Permissions Overview" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 #, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +msgid "%s Repository Group Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "" @@ -3093,7 +3153,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "" @@ -3189,8 +3249,17 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 @@ -3198,28 +3267,20 @@ msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" +msgid "Repository Groups Administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +msgid "Number of Top-level Repositories" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:14 @@ -3227,24 +3288,24 @@ msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +msgid "Optional URL from which repository should be cloned." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/forks/fork.html:42 +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3253,7 +3314,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "" @@ -3264,164 +3325,168 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +#, fuzzy, python-format +msgid "%s Creating Repository" +msgstr "Prázdny repozitár" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" -"Repository \"%(repo_name)s\" is being created, you will be redirected when " -"this process is finished.repo_name" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:42 +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" +msgid "Remote" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:58 -msgid "Remote" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +msgid "Public Journal Visibility" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +msgid "Add to Public Journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 msgid "" -"All actions made on this repository will be accessible to everyone in public " -"journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "Prázdny repozitár" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." +msgstr "Prázdny repozitár" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "Prázdny repozitár" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Triggering a pull locks repository by user who pulled, only the same user " -"can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "Prázdny repozitár" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be inaccessible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +msgid "Invalidate Repository Cache" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +msgid "Confirm to invalidate repository cache." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3434,12 +3499,12 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "" @@ -3473,7 +3538,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" +msgid "Extra fields are disabled." msgstr "" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 @@ -3481,19 +3546,19 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" +msgid "Remote URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +msgid "Pull Changes from Remote Location" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +msgid "Confirm to pull changes from remote side." msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3501,7 +3566,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3511,15 +3576,16 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" " Useful for CI systems, or any other cases " -"that you need to hardcode the url into 3rd party service." +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" +#: kallithea/templates/summary/summary.html:72 +msgid "Clone URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 @@ -3540,15 +3606,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." +msgid "URL used for doing remote pulls." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" @@ -3565,47 +3626,47 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" +msgid "Reset Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +msgid "Confirm to remove current statistics." msgstr "" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" -msgstr "" - -#: kallithea/templates/admin/repos/repos.html:54 +msgid "Repositories Administration" +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:40 +msgid "Settings Administration" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3674,48 +3735,54 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +msgid "Save Settings" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:69 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "" @@ -3729,8 +3796,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in the " -"database check this option to scan obsolete data in database and remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3738,19 +3805,17 @@ msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option selected. " -"Use this to reload data and clear cache keys." +msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3767,7 +3832,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3792,11 +3857,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" +msgid "Git version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3804,7 +3869,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3812,7 +3877,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3825,8 +3890,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3846,7 +3911,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +msgid "Mercurial extensions" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3859,24 +3924,25 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "" +#, fuzzy +msgid "Location of repositories" +msgstr "Repozitáre" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this " -"value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3905,27 +3971,29 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following variables " -"of the URL will be replaced accordingly.\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" +"Gravatar URL allows you to use another avatar server application.\n" +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" " {email} user " "email,\n" -" {md5email} md5 hash " -"of the user email (like at gravatar.com),\n" -" {size} size of " -"the image that is expected from the server application,\n" -" {netloc} network " -"location/server host of running Kallithea server" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', " -"available vars:\n" -" {scheme} 'http' or " -"'https' sent from running Kallithea server,\n" +"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 " @@ -3936,71 +4004,72 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:64 +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -4010,19 +4079,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "" @@ -4041,7 +4105,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "" @@ -4049,23 +4113,15 @@ msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_groups.html:13 +msgid "User Groups Administration" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4073,18 +4129,19 @@ msgid "Add user" msgstr "" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "" @@ -4093,14 +4150,14 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "Default Permissions" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4112,6 +4169,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4145,8 +4203,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4158,193 +4216,183 @@ msgstr "" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" -msgstr "" - -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" +msgid "Users Administration" msgstr "" #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 +msgid "Options" +msgstr "" + #: kallithea/templates/base/base.html:158 -msgid "Options" +#: kallithea/templates/forks/forks_data.html:21 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:13 +#: kallithea/templates/branches/branches.html:56 +#: kallithea/templates/branches/branches_data.html:13 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:13 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 +msgid "Search" msgstr "" #: kallithea/templates/base/base.html:166 -#: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +msgid "Unlock" msgstr "" #: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "" - -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 -msgid "Search" -msgstr "" - -#: kallithea/templates/base/base.html:174 -msgid "Unlock" +msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "" - -#: kallithea/templates/base/base.html:263 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:286 -msgid "Log Out" -msgstr "" - -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:224 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:225 #: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "" -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:323 +#: kallithea/templates/base/base.html:236 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:237 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:241 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:243 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:244 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:249 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:292 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:299 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:322 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/templates/base/base.html:347 +msgid "Log Out" +msgstr "" + +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4355,8 +4403,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4405,85 +4453,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" -msgstr "" - -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" -msgstr "" - -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Open New Pull Request for Selected Changesets" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +msgid "Show Selected Changeset __S" +msgstr "" + +#: kallithea/templates/base/root.html:35 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" +#: kallithea/templates/base/root.html:39 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:43 +msgid "Specify changeset" msgstr "" #: kallithea/templates/bookmarks/bookmarks.html:5 @@ -4491,26 +4538,29 @@ msgid "%s Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "" @@ -4520,7 +4570,7 @@ msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4537,193 +4587,198 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "Prázdny repozitár" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4731,9 +4786,9 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4741,123 +4796,154 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "Zmena stavu -> %s" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +msgid "No title" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +msgid "Comment from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 -msgid "Commenting on line {1}." +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +msgid "Commenting on line {1}." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "" -"Use @username inside this text to send notification to this Kallithea user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +msgid "Use @username inside this text to notify another user" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +msgid "Submitting ..." +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +msgid "Use @username inside this text to send notification to another local user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" +msgstr "Zmeny" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "Žiadne zmeny" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "(zatvorené)" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4865,12 +4951,12 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" +#: kallithea/templates/changeset/diff_block.html:87 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:90 +msgid "Renamed" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 @@ -4881,30 +4967,53 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "Zmeny" + +#: kallithea/templates/compare/compare_cs.html:85 +msgid "behind" +msgstr "" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -4913,38 +5022,43 @@ msgstr[2] "" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "" @@ -4953,17 +5067,22 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 @@ -4971,11 +5090,11 @@ msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "" @@ -4983,66 +5102,50 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +#: kallithea/templates/email_templates/pull_request.html:5 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "" @@ -5052,85 +5155,82 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" -msgstr "" - -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" +msgstr "Žiadne zmeny" + +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 -msgid "Search File List" -msgstr "" - -#: kallithea/templates/files/files_browser.html:29 -msgid "Loading file list..." -msgstr "" - -#: kallithea/templates/files/files_browser.html:42 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:43 -msgid "Mimetype" -msgstr "" - #: kallithea/templates/files/files_browser.html:44 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:48 +msgid "Loading file list..." +msgstr "" + +#: kallithea/templates/files/files_browser.html:61 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:62 +msgid "Mimetype" +msgstr "" + +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" -msgstr "" - -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:64 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +msgid "Last Committer" msgstr "" #: kallithea/templates/files/files_delete.html:4 @@ -5138,8 +5238,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5148,32 +5248,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5219,12 +5315,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "" @@ -5245,9 +5341,9 @@ msgid "%s Followers" msgstr "" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "" @@ -5260,31 +5356,35 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5293,9 +5393,9 @@ msgid "%s Forks" msgstr "" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "" @@ -5303,102 +5403,159 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" -msgstr "" - -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" +msgstr "Prázdny repozitár" + +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:44 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +msgid "Pull Request Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, python-format +msgid "Latest vote: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request #%s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +msgid "Summarize the changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5406,29 +5563,80 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "Zatiaľ nie sú žiadne súbory. %s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +msgid "on" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +msgid "Created by" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "Update" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +msgid "Save as New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "Žiadne zmeny" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 @@ -5436,32 +5644,42 @@ msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 @@ -5470,27 +5688,27 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" -msgstr "" - -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:16 +msgid "Search in All Repositories" +msgstr "" + +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "" +#: kallithea/templates/search/search.html:62 +msgid "Search in" +msgstr "" + #: kallithea/templates/search/search.html:65 -msgid "Search in" -msgstr "" - -#: kallithea/templates/search/search.html:68 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "" @@ -5505,67 +5723,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:389 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:390 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "" + #: kallithea/templates/summary/statistics.html:392 -msgid "commits" -msgstr "" - -#: kallithea/templates/summary/statistics.html:393 -msgid "files added" +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" +msgid "commit" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "" @@ -5574,78 +5792,79 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:111 +msgid "Download" +msgstr "" + #: kallithea/templates/summary/summary.html:115 -msgid "Download" -msgstr "" - -#: kallithea/templates/summary/summary.html:119 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" -msgstr "" - -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" -msgstr "" - -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" +msgstr "Zmena stavu -> %s" + +#: kallithea/templates/summary/summary.html:191 +msgid "Quick Start" +msgstr "" + +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "" @@ -5655,6 +5874,7 @@ msgid "%s Tags" msgstr "" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" -msgstr "" +#: kallithea/templates/tags/tags.html:26 +msgid "Compare Tags" +msgstr "" +
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2014-12-12 14:19+0200\n" "Last-Translator: Michal Čihař <michal@cihar.com>\n" "Language-Team: Simplified Chinese " @@ -19,77 +19,80 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.2-dev\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "还没有修订集" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "所有分支" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "无" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "状态修改为%s" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "%d条评论" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "主页" - -#: kallithea/controllers/error.py:101 +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 msgid "The request could not be understood by the server due to malformed syntax." msgstr "由于错误的语法，服务器无法对请求进行响应。" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:99 msgid "Unauthorized access to resource" msgstr "未授权的资源访问" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:101 msgid "You don't have permission to view this page" msgstr "无权访问该页面" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "资源未找到" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -106,12 +109,12 @@ msgstr "%s %s订阅" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "修订集太大已被截断......" @@ -129,214 +132,292 @@ msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, fuzzy, python-format +msgid "%s at %s" +msgstr "%s零%s" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "版本库由%s于%s锁定" -#: kallithea/controllers/files.py:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "无变更" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "无内容" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "无文件名" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "空版本库" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "未知包类型" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "修订集" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "标签" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "版本库" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "公共日志" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "日志" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "密码重置链接已经发送" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "密码已经成功重置，新密码已经发送到你的邮箱" -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "修订集" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" +#: kallithea/controllers/pullrequests.py:130 +#, python-format +msgid "%s (closed)" msgstr "" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "修订集" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "书签" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "拉取请求的标题至少3个字符" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +#, fuzzy +msgid "No description" +msgstr "描述" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +#, fuzzy +msgid "Error occurred while creating pull request" msgstr "提交拉取请求时发生错误" -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +#, fuzzy +msgid "Pull request update created" +msgstr "拉取请求检视人员" + +#: kallithea/controllers/pullrequests.py:503 +#, fuzzy +msgid "Pull request updated" +msgstr "拉取请求" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "" - -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "只能以批准或者驳回的状态关闭拉取请求" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +#, fuzzy +msgid "Closing." +msgstr "使用中" #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -347,23 +428,26 @@ msgstr "没有索引用于搜索。请运行whoosh索引器" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" +#, fuzzy +msgid "An error occurred during search operation." msgstr "在搜索操作中发生异常" -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +#, fuzzy +msgid "No data ready yet" msgstr "数据未加载" -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" @@ -371,68 +455,68 @@ msgid "Default settings updated successfully" msgstr "默认设置已经成功更新" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -441,62 +525,55 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "已为用户添加电子邮件 %s" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "成功删除用户电子邮件" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "无" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -512,28 +589,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "管理" @@ -555,26 +632,26 @@ msgstr "" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "" @@ -590,21 +667,21 @@ msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "" @@ -634,182 +711,182 @@ msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "版本库%s成功更新" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除%s的时候发生错误" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:526 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: kallithea/controllers/admin/repos.py:526 +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "令牌不匹配" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "无" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "解锁时发生错误" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "版本库已被%s" -#: kallithea/controllers/admin/repos.py:618 +#: kallithea/controllers/admin/repos.py:622 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:622 +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" #: kallithea/controllers/admin/settings.py:270 @@ -828,23 +905,23 @@ msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "新建钩子" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:418 msgid "Updated hooks" msgstr "更新钩子" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" @@ -853,106 +930,114 @@ msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "用户更新成功" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "删除用户时发生错误" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "无法编辑该用户" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "必须登录才能访问该页面" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "未找到修订集" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" @@ -965,163 +1050,158 @@ msgid "No changes detected" msgstr "未发现差异" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支%s" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "创建标签%s" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "未找到修订集" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "显示合并的修订集%s->%s" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "比较显示" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "还有" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "%s个" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "修订" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "复刻名称%s" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "拉取请求#%s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:771 msgid "[deleted] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 msgid "[created] repository" msgstr "[创建]版本库" -#: kallithea/lib/helpers.py:747 +#: kallithea/lib/helpers.py:775 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 msgid "[forked] repository" msgstr "[复刻]版本库" -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 msgid "[updated] repository" msgstr "[更新]版本库" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:781 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:755 +#: kallithea/lib/helpers.py:783 msgid "[delete] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:791 msgid "[created] user" msgstr "[创建]用户" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:793 msgid "[updated] user" msgstr "[更新]用户" -#: kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:795 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:797 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:799 msgid "[commented] on revision in repository" msgstr "[评论]了版本库中的修订" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:801 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:803 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:805 msgid "[pushed] into" msgstr "[推送]到" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:807 msgid "[committed via Kallithea] into repository" msgstr "[通过Kallithea提交]到版本库" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:809 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "[拉取]自" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr " 还有%s个" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "没有文件" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1129,68 +1209,98 @@ "repositories" msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启Kallithea以重新扫描版本库" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "%s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "%s前" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "%s零%s前" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "刚才" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "无版本库访问权限" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "版本库读取权限" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1200,12 +1310,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "无版本库访问权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "版本库写入权限" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1215,162 +1325,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" -msgstr "版本库读取权限" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" +msgstr "版本库管理权限" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" -msgstr "版本库写入权限" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" +msgstr "无版本库组访问权限" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" -msgstr "版本库管理权限" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "版本库组读取权限" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" +msgstr "版本库组写入" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "无版本库组访问权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" -msgstr "版本库组读取权限" +msgid "Repository Group admin access" +msgstr "版本库组管理权限" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" -msgstr "版本库组写入" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" +msgstr "Kallithea 管理员" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" -msgstr "版本库组管理权限" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "禁用创建版本库" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" +msgstr "允许创建版本库" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "Kallithea 管理员" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "禁用创建版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" -msgstr "允许创建版本库" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "禁用复刻版本库" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "允许复刻版本库" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" +msgstr "禁用注册" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "禁用复刻版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "允许复刻版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" -msgstr "禁用注册" +msgid "Register new user with Kallithea with manual activation" +msgstr "用手动激活注册新用户" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "用手动激活注册新用户" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "用自动激活注册新用户" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "未检视" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "已批准" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1380,12 +1490,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "未检视" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "驳回" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1395,52 +1505,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "已批准" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "驳回" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "检视中" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1449,8 +1553,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1461,23 +1565,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1485,8 +1576,19 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1496,8 +1598,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1507,19 +1609,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1529,21 +1620,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1551,32 +1642,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1584,48 +1686,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "在%s行" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "[提及]" @@ -1651,254 +1731,301 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, fuzzy, python-format +msgid "New user %(new_username)s registered" +msgstr "用户名称 %(username)s 无效" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +#, fuzzy +msgid "Closing" +msgstr "使用中" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "最新tip版本" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "由于是系统帐号，无法删除该用户" -#: kallithea/model/user.py:276 -#, python-format +#: kallithea/model/user.py:261 +#, fuzzy, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" + +#: kallithea/model/user.py:268 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: kallithea/model/user.py:304 +#: kallithea/model/user.py:275 +#, fuzzy, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "值不能为空" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "用户名称%(username)s已经存在" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "不允许用户名 \"%(username)s\"" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:151 +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:158 +#: kallithea/model/validators.py:139 #, python-format msgid "Username %(username)s is not valid" msgstr "用户名称 %(username)s 无效" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:158 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "不能将这个组作为parent" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "组 \"%(group_name)s\" 已经存在" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "已经存在名为 \"%(group_name)s\" 的版本库" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效（非ASCII）字符" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:291 msgid "Passwords do not match" msgstr "密码不符" -#: kallithea/model/validators.py:327 +#: kallithea/model/validators.py:308 msgid "invalid password" msgstr "无效密码" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:309 msgid "invalid user name" msgstr "无效用户名" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:310 msgid "Your account is disabled" msgstr "该帐号已被禁用" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "版本库名称不能为%(repo)s" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "已经存在版本库%(repo)s" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\"" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" +#: kallithea/model/validators.py:474 +#, fuzzy +msgid "invalid clone URL" msgstr "无效的克隆地址" -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +#: kallithea/model/validators.py:475 +#, fuzzy +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" msgstr "无效的克隆地址，提供一个有效的克隆 http(s)或svn+http(s)地址" -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "复刻版本库必须和父版本库类型相同" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "该邮件地址已被使用" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "邮件地址\"%(email)s\"不存在" -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 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:804 +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1909,35 +2036,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "快速过滤..." #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "版本库" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -1954,164 +2082,165 @@ msgstr "" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "描述" -#: kallithea/templates/index_base.html:126 +#: kallithea/templates/index_base.html:129 #: kallithea/templates/admin/my_account/my_account_repos.html:46 #: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 #: kallithea/templates/admin/repos/repo_add_base.html:9 #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 #: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks.html:49 #: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 +#: kallithea/templates/branches/branches.html:49 #: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 #: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "名称" -#: kallithea/templates/index_base.html:129 +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "最后修改" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "Tip" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "所有者" -#: kallithea/templates/index_base.html:141 +#: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "点击以升序排列" -#: kallithea/templates/index_base.html:142 +#: kallithea/templates/index_base.html:145 #: kallithea/templates/admin/my_account/my_account_repos.html:58 #: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 msgid "Click to sort descending" msgstr "点击以降序排列" -#: kallithea/templates/index_base.html:143 +#: kallithea/templates/index_base.html:146 msgid "No repositories found." msgstr "" -#: kallithea/templates/index_base.html:144 +#: kallithea/templates/index_base.html:147 #: kallithea/templates/admin/my_account/my_account_repos.html:60 #: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 msgid "Data error." msgstr "数据错误" -#: kallithea/templates/index_base.html:145 +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "载入中..." -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "登录" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "帐号" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "密码" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "记住密码" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "登录" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "忘记了密码？" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "还没有帐号？" @@ -2119,78 +2248,85 @@ msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, fuzzy, python-format +msgid "Reset Your Password to %s" +msgstr "忘记了密码？" + +#: kallithea/templates/password_reset.html:14 +#, fuzzy +msgid "Reset Your Password" +msgstr "忘记了密码？" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" +#: kallithea/templates/password_reset.html:46 +#, fuzzy +msgid "Send Password Reset Email" +msgstr "确认新密码" + +#: kallithea/templates/password_reset.html:47 +#, fuzzy +msgid "" +"Password reset link will be sent to the email address matching your " +"username." msgstr "密码重置地址已经发送到邮件" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "注册" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "确认密码" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "名" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "姓" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "电子邮件" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "注册后，帐号将启用" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" -msgstr "管理员审核后，你注册的帐号将被启用" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." +msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "没有任何分支" @@ -2209,37 +2345,39 @@ msgstr "无书签" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +#, fuzzy +msgid "Admin Journal" msgstr "系统日志" -#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/admin/admin.html:10 msgid "journal filter..." msgstr "日志过滤..." -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +#, fuzzy +msgid "Filter" msgstr "过滤" -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "%s条" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "操作" @@ -2249,11 +2387,11 @@ msgstr "版本库" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "日期" @@ -2270,160 +2408,161 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "保存" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" msgstr "版本库默认设置" -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "默认设置" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "类型" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "私有版本库" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "私有版本库只对成员可见。" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "启用统计" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "启用概况页的统计窗口" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "启用下载" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "启用概况页的下载菜单" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "启用锁定" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "启用版本库的拉取锁定" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2431,75 +2570,69 @@ msgid "never" msgstr "" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2507,118 +2640,114 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "重置" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "删除" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "我的账户" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "我的账户" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" -msgstr "" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" +msgstr "关注的" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "关注的" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "拉取请求" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" +#, fuzzy +msgid "My Permissions" msgstr "我的权限" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 @@ -2689,7 +2818,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2710,7 +2838,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2719,8 +2847,9 @@ msgstr "增加邮箱" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" -msgstr "" +#, fuzzy +msgid "Change Your Account Password" +msgstr "忘记了密码？" #: kallithea/templates/admin/my_account/my_account_password.html:7 msgid "Current password" @@ -2735,115 +2864,77 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "修改你的头像" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/my_account/my_account_profile.html:12 #: kallithea/templates/admin/users/user_edit_profile.html:9 msgid "Using" msgstr "使用中" -#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/my_account/my_account_profile.html:14 #: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:13 +#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "我创建的" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "拉取请求#%s创建于%s" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "已关闭" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "确认删除拉取请求" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "无条目" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "我参与的" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "拉取请求#%s由%s创建于%s" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" -msgstr "" +#, fuzzy +msgid "Repositories You Own" +msgstr "版本库" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "没有找到记录" #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" -msgstr "" +#, fuzzy +msgid "Repositories You are Watching" +msgstr "版本库路径" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "我的通知" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "全部" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "评论" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +#, fuzzy +msgid "Mark All Read" msgstr "全部标记为已读" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2851,38 +2942,40 @@ msgstr "无通知" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" +#: kallithea/templates/admin/notifications/show_notification.html:11 +#, fuzzy +msgid "Show Notification" msgstr "显示通知" -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "通知" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" +#, fuzzy +msgid "Permissions Administration" msgstr "权限管理" -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "权限" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "" @@ -2893,8 +2986,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2914,7 +3007,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "版本库组" @@ -2947,8 +3040,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2968,7 +3061,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -2979,7 +3072,7 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +msgid "All IP addresses are allowed." msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -2988,68 +3081,64 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +#, fuzzy +msgid "Default User Permissions Overview" +msgstr "默认权限" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "组名" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "上级组" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +#, fuzzy, python-format +msgid "%s Repository Group Settings" +msgstr "版本库组" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "设置" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "" @@ -3073,7 +3162,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "创建于" @@ -3171,57 +3260,62 @@ " groups and repositories inside" msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "确认删除用户：%s" + #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "首页" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "有" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" +#, fuzzy +msgid "Repository Groups Administration" +msgstr "版本库管理员" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#, fuzzy +msgid "Number of Top-level Repositories" msgstr "顶层版本库数量" -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" -msgstr "添加版本库" - #: kallithea/templates/admin/repos/repo_add_base.html:14 msgid "Import existing repository ?" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "克隆自" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +#, fuzzy +msgid "Optional URL from which repository should be cloned." msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。" #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 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:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "可选的，选择一个组将版本库放到其中" #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3230,7 +3324,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "默认修订" @@ -3241,162 +3335,177 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +#, fuzzy, python-format +msgid "%s Creating Repository" +msgstr "[创建]版本库" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "建立版本库" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "远程" -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "统计" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "复刻自" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +#, fuzzy +msgid "Parent" +msgstr "上级组" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" +#, fuzzy +msgid "Manually set this repository as a fork of another from the list." msgstr "从列表中手动设置这个版本库复刻自另一版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#, fuzzy +msgid "Public Journal Visibility" +msgstr "公共日志" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "从公共日志删除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +#, fuzzy +msgid "Add to Public Journal" +msgstr "公共日志" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 +#, fuzzy msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" +"All actions done in this repository will be visible to everyone in the " +"public journal." msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +#, fuzzy +msgid "Change Locking" +msgstr "启用锁定" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +#, fuzzy +msgid "Confirm to unlock repository." msgstr "确认解锁版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "公共版本库" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." msgstr "确认锁定版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "公共版本库" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "版本库未锁定" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库：%s" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "[删除]版本库" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +#, fuzzy +msgid "Invalidate Repository Cache" msgstr "清除版本库缓存" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +#, fuzzy +msgid "Confirm to invalidate repository cache." msgstr "确认清除版本库缓存" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#, fuzzy msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +#, fuzzy +msgid "List of Cached Values" msgstr "缓存值列表" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3409,12 +3518,12 @@ msgstr "键" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "启用" @@ -3448,27 +3557,31 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" -msgstr "" +#, fuzzy +msgid "Extra fields are disabled." +msgstr "禁用注册" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "private repository" msgstr "私有版本库" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" -msgstr "" +#, fuzzy +msgid "Remote URL" +msgstr "克隆地址" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" +#, fuzzy +msgid "Pull Changes from Remote Location" msgstr "从远程路径拉取修订集" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +#, fuzzy +msgid "Confirm to pull changes from remote side." msgstr "确认从远程拉取修订集" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3476,7 +3589,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3486,15 +3599,17 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" +#: kallithea/templates/summary/summary.html:72 +#, fuzzy +msgid "Clone URL" msgstr "克隆地址" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 @@ -3515,15 +3630,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." -msgstr "可选的，选择一个组将版本库放到其中" +msgid "URL used for doing remote pulls." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "文件浏览、下载、whoosh和README的默认修订版本" @@ -3540,47 +3650,51 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" -msgstr "" +#, fuzzy +msgid "Reset Statistics" +msgstr "启用统计" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +#, fuzzy +msgid "Confirm to remove current statistics." msgstr "确认移除当前统计" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" +#, fuzzy +msgid "Repositories Administration" msgstr "版本库管理员" -#: kallithea/templates/admin/repos/repos.html:54 +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" +#, fuzzy +msgid "Settings Administration" msgstr "系统设置" -#: kallithea/templates/admin/settings/settings.html:40 +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "钩子" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3649,35 +3763,42 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" msgstr "保存设置" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3687,10 +3808,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" +#, fuzzy +msgid "Custom Hooks" msgstr "自定义钩子" -#: kallithea/templates/admin/settings/settings_hooks.html:69 +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "移除钩子失败" @@ -3704,9 +3826,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3714,19 +3835,17 @@ msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." +msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3743,7 +3862,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3768,11 +3887,12 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" -msgstr "" +#, fuzzy +msgid "Git version" +msgstr "编辑权限" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3780,7 +3900,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3788,7 +3908,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3801,8 +3921,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3822,7 +3942,8 @@ msgstr "推送后更新版本库（hg update）" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" +#, fuzzy +msgid "Mercurial extensions" msgstr "Mercurial扩展" #: kallithea/templates/admin/settings/settings_vcs.html:47 @@ -3835,13 +3956,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "版本库路径" +#, fuzzy +msgid "Location of repositories" +msgstr "创建版本库" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" @@ -3851,8 +3973,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3881,8 +4003,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3898,8 +4020,10 @@ #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -3912,71 +4036,73 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "图标" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "显示公共版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "显示私有版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +#, fuzzy +msgid "Show public/private icons next to repository names." +msgstr "显示公共版本库图标" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "元标记" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -3986,19 +4112,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "默认权限" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "成员" @@ -4017,7 +4138,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "还没有成员" @@ -4025,23 +4146,16 @@ msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "移除全部项目" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "启用成员" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "添加全部项目" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_groups.html:13 +#, fuzzy +msgid "User Groups Administration" +msgstr "用户管理员" + +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4049,18 +4163,19 @@ msgid "Add user" msgstr "添加用户" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "用户" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "确认密码" @@ -4069,14 +4184,15 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +msgid "Default Permissions" +msgstr "默认权限" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4088,6 +4204,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4134,193 +4251,188 @@ msgstr "确认新密码" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" +#, fuzzy +msgid "Users Administration" msgstr "用户管理员" -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "用户" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" -msgstr "" - #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +#, fuzzy +msgid "Create Fork" +msgstr "创建于" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "概况" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "修订记录" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "浏览" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 msgid "Options" msgstr "选项" -#: kallithea/templates/base/base.html:166 +#: kallithea/templates/base/base.html:158 #: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +#, fuzzy +msgid "Compare Fork" msgstr "比较复刻" -#: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 +#: kallithea/templates/branches/branches.html:56 #: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 +#: kallithea/templates/tags/tags.html:56 #: kallithea/templates/tags/tags_data.html:13 msgid "Compare" msgstr "比较显示" -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 msgid "Search" msgstr "搜索" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:166 msgid "Unlock" msgstr "" +#: kallithea/templates/base/base.html:168 +msgid "Lock" +msgstr "" + #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "复刻" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" +#: kallithea/templates/base/base.html:224 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:225 +#: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 +msgid "Journal" +msgstr "日志" + +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 +msgid "Public journal" +msgstr "公共日志" + +#: kallithea/templates/base/base.html:236 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:237 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:241 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:243 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:244 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:249 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +#, fuzzy +msgid "My Pull Requests" +msgstr "拉取请求" + +#: kallithea/templates/base/base.html:292 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:299 +#, fuzzy +msgid "Login to Your Account" msgstr "登录" -#: kallithea/templates/base/base.html:263 +#: kallithea/templates/base/base.html:322 msgid "Forgot password ?" msgstr "忘记密码？" -#: kallithea/templates/base/base.html:286 +#: kallithea/templates/base/base.html:347 msgid "Log Out" msgstr "退出" -#: kallithea/templates/base/base.html:311 -msgid "Show recent activity" -msgstr "" - -#: kallithea/templates/base/base.html:312 -#: kallithea/templates/journal/journal.html:4 -msgid "Journal" -msgstr "日志" - -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 -msgid "Public journal" -msgstr "公共日志" - -#: kallithea/templates/base/base.html:323 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:324 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 -msgid "Search in repositories" -msgstr "" - -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4381,112 +4493,121 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" +msgstr "%d条评论" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "停止关注该版本库" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "开始关注该版本库" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "组" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "成员" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +#, fuzzy +msgid "Open New Pull Request" msgstr "新建拉取请求" -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" +#: kallithea/templates/base/root.html:32 +#, fuzzy +msgid "Open New Pull Request for Selected Changesets" msgstr "为选择的变更集创建新的拉取请求" -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +#, fuzzy +msgid "Show Selected Changeset __S" +msgstr "显示合并的修订集%s->%s" + +#: kallithea/templates/base/root.html:35 +#, fuzzy +msgid "Selection Link" msgstr "选择链接" -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +#, fuzzy +msgid "Collapse Diff" +msgstr "文件差异" + +#: kallithea/templates/base/root.html:37 +#, fuzzy +msgid "Expand Diff" +msgstr "文件差异" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" -msgstr "" +#: kallithea/templates/base/root.html:39 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#, fuzzy +msgid "Specify changeset" +msgstr "%s修订集" #: kallithea/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s书签" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "作者" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "修订" @@ -4496,7 +4617,7 @@ msgid "%s Branches" msgstr "%s分支" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4511,318 +4632,360 @@ msgid_plural "showing %d out of %d revisions" msgstr[0] "显示%d/%d个版本" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "显示" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "清除选择" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "确认锁定版本库" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "显示" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +#, fuzzy +msgid "Branch filter:" +msgstr "过滤" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "没有任何变更" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "通过Kallithea直接添加或者上传文件" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "推送新版本库" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "已有版本库？" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s修订集" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "修订集状态" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d条评论" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "(%d内嵌)" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "合并" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +#, fuzzy +msgid "Grafted from:" +msgstr "创建于" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "修改%s个文件" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "修改%s个文件包括%s行插入和%s行删除" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +#, fuzzy +msgid "Status change from pull request" +msgstr "状态修改为%s" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +#, fuzzy +msgid "No title" +msgstr "无文件" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +#, fuzzy +msgid "Comment from pull request" +msgstr "[评论]拉取请求" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "提交中……" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" +msgstr "%d条评论" + +#: kallithea/templates/changeset/changeset_file_comment.html:67 msgid "Commenting on line {1}." msgstr "在{1}行上评论" -#: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "评论使用%s语法并支持%s" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +#, fuzzy +msgid "Use @username inside this text to notify another user" msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" -msgstr "" - #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +#, fuzzy +msgid "Submitting ..." +msgstr "提交中……" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "评论" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "必须登录才能评论" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "现在登陆" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "隐藏" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d条评论" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "(%d内嵌)" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, fuzzy, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "通用" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +#, fuzzy +msgid "Use @username inside this text to send notification to another local user." +msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" +msgstr "修订集状态" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "无变更" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +#, fuzzy +msgid "Close" +msgstr "已关闭" #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s修订集" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "影响文件" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4830,13 +4993,15 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" -msgstr "" +#: kallithea/templates/changeset/diff_block.html:87 +#, fuzzy +msgid "Deleted" +msgstr "删除" + +#: kallithea/templates/changeset/diff_block.html:90 +#, fuzzy +msgid "Renamed" +msgstr "读" #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -4846,68 +5011,97 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "%s修订集" + +#: kallithea/templates/compare/compare_cs.html:85 +#, fuzzy +msgid "behind" +msgstr "重新索引" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "显示%s个提交" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "无文件" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "Mercurial版本库" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "Git版本库" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "公共版本库" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "无修订" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "订阅%s的RSS" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "订阅%s的Atom" @@ -4916,29 +5110,34 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." -msgstr "这是一个Kallithea通知。" +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "我们收到重置你用户密码的请求。" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "点击下面的链接以重新生成密码：" @@ -4946,67 +5145,51 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "标题" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +#: kallithea/templates/email_templates/pull_request.html:5 +#, fuzzy, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "[评论]拉取请求" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, fuzzy, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "为这个拉取请求增加检视人员" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "[评论]拉取请求" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "[评论]拉取请求" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "查看用户" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "重定向到%s，于%s秒后" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "文件差异" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "" @@ -5016,85 +5199,84 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "新建文件" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "位置" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "或者" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" msgstr "提交修改" -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 +#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:29 +#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "加载文件列表..." -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "大小" -#: kallithea/templates/files/files_browser.html:43 +#: kallithea/templates/files/files_browser.html:62 msgid "Mimetype" msgstr "MIME类型" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "最后修订号" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" +#: kallithea/templates/files/files_browser.html:64 +#, fuzzy +msgid "Last Modified" msgstr "最后修改于" -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:65 +#, fuzzy +msgid "Last Committer" msgstr "最后提交者" #: kallithea/templates/files/files_delete.html:4 @@ -5102,8 +5284,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5112,32 +5294,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "编辑文件" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5181,12 +5359,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "二进制文件（%s）" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "文件过大，不能显示" @@ -5207,9 +5385,9 @@ msgid "%s Followers" msgstr "%s个关注者" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "关注者" @@ -5222,31 +5400,36 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "复刻名称" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +#, fuzzy +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "文件浏览、下载、whoosh和README的默认修订版本" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "私有" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "拷贝权限" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "从被复刻版本库拷贝权限" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "克隆后更新" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "完成克隆后检出源代码" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5255,9 +5438,9 @@ msgid "%s Forks" msgstr "%s个复刻" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "复刻" @@ -5265,164 +5448,294 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "无复刻" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "订阅日志ATOM" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "订阅日志RSS" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" msgstr "我的版本库" -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "没有条目" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "公共日志" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "订阅公共日志ATOM" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "订阅公共日志RSS" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" +#, fuzzy +msgid "New Pull Request" msgstr "新建拉取请求" -#: kallithea/templates/pullrequests/pullrequest.html:44 +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "标题" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" +#: kallithea/templates/pullrequests/pullrequest.html:72 +msgid "Destination repository" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +#, fuzzy +msgid "Pull Request Reviewers" msgstr "拉取请求检视人员" -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "所有者" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "为这个拉取请求增加检视人员" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "详细比较显示" - -#: kallithea/templates/pullrequests/pullrequest.html:149 -msgid "Destination repository" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +#, fuzzy +msgid "No entries" +msgstr "没有条目" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, fuzzy, python-format +msgid "Latest vote: %s" +msgstr "最新tip版本" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +#, fuzzy +msgid "Delete Pull Request" +msgstr "新建拉取请求" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "确认删除拉取请求" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "已关闭" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, fuzzy, python-format +msgid "Pull request #%s from %s#%s" +msgstr "拉取请求#%s创建于%s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#, fuzzy +msgid "Summarize the changes" +msgstr "提交修改" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "还未检视的检视人员" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d个检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "没有任何分支" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#, fuzzy +msgid "on" +msgstr "无" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +#, fuzzy +msgid "Created by" +msgstr "创建于" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +msgid "Update" +msgstr "[更新]用户" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "所有者" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "检视者" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "%d个检视者" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" -msgstr "比较显示" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +#, fuzzy +msgid "Save as New Pull Request" +msgstr "新建拉取请求" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "无变更" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +#, fuzzy +msgid "Pull Request Content" +msgstr "拉取请求" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" -msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, fuzzy, python-format +msgid "Pull Requests from %s'" +msgstr "拉取请求#%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, fuzzy, python-format +msgid "Pull Requests to '%s'" +msgstr "拉取请求#%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, fuzzy, python-format +msgid "Show Pull Requests to %s" +msgstr "拉取请求#%s" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, fuzzy, python-format +msgid "Show Pull Requests from '%s'" +msgstr "[关闭] 拉取请求" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +#, fuzzy +msgid "Pull Requests Created by Me" +msgstr "拉取请求检视人员" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +#, fuzzy +msgid "Pull Requests I Participate In" +msgstr "我参与的" #: kallithea/templates/search/search.html:6 #, python-format @@ -5430,27 +5743,28 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" +#: kallithea/templates/search/search.html:16 +#, fuzzy +msgid "Search in All Repositories" msgstr "在所有的版本库中搜索" -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "搜索短语" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "搜索范围" -#: kallithea/templates/search/search.html:68 +#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "文件内容" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "提交信息" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "文件名" @@ -5465,67 +5779,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "已收集的统计：" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "文件" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:389 msgid "commits" msgstr "提交" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:390 msgid "files added" msgstr "文件已添加" +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "文件已更改" + +#: kallithea/templates/summary/statistics.html:392 +msgid "files removed" +msgstr "文件已删除" + #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" -msgstr "文件已更改" +msgid "commit" +msgstr "提交" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" -msgstr "文件已删除" +msgid "file added" +msgstr "文件已添加" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" +msgstr "文件已更改" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "提交" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "文件已添加" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "文件已更改" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "文件已删除" @@ -5534,78 +5848,80 @@ msgid "%s Summary" msgstr "%s概要" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "版本库由%s锁定" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "版本库未锁定" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "克隆地址" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "复刻自" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "以名字显示" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "按ID显示" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "文件趋势图" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:111 msgid "Download" msgstr "下载" -#: kallithea/templates/summary/summary.html:119 +#: kallithea/templates/summary/summary.html:115 msgid "There are no downloads yet" msgstr "无下载" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "这个版本库的下载已经禁用" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "zip打包下载" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "勾选以下载包含子版本库的压缩包" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "包括子版本库" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" -msgstr "" - -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" +msgstr "文件已更改" + +#: kallithea/templates/summary/summary.html:191 +#, fuzzy +msgid "Quick Start" msgstr "快速入门" -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "下载%s为%s包" @@ -5615,6 +5931,8 @@ msgid "%s Tags" msgstr "%s标签" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" +#: kallithea/templates/tags/tags.html:26 +#, fuzzy +msgid "Compare Tags" msgstr "比较标签" +
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Wed Apr 01 03:49:13 2015 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Wed Apr 01 03:50:15 2015 +0200 @@ -5,87 +5,91 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, 2011 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-07-02 19:08-0400\n" +"POT-Creation-Date: 2015-04-01 03:17+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" "Language-Team: Chinese (Taiwan) " "<https://hosted.weblate.org/projects/kallithea/kallithea/zh_TW/>\n" "Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" - -#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 -#: kallithea/controllers/pullrequests.py:265 + +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:449 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:186 -msgid "All Branches" -msgstr "" - -#: kallithea/controllers/changelog.py:189 +#: kallithea/controllers/changelog.py:157 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "無" + +#: kallithea/controllers/changelog.py:160 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:87 +#: kallithea/controllers/changeset.py:89 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 +#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:167 +#: kallithea/controllers/changeset.py:169 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:121 +#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:746 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:355 -#: kallithea/controllers/pullrequests.py:482 -#, python-format -msgid "Status change -> %s" -msgstr "" - -#: kallithea/controllers/changeset.py:386 +#: kallithea/controllers/changeset.py:352 +#: kallithea/controllers/pullrequests.py:699 +#, fuzzy +msgid "No comments." +msgstr "" + +#: kallithea/controllers/changeset.py:382 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" -#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#: kallithea/controllers/compare.py:158 kallithea/templates/base/root.html:42 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:72 -msgid "Home page" -msgstr "首頁" +#: kallithea/controllers/compare.py:255 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" + +#: kallithea/controllers/error.py:96 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:99 +msgid "Unauthorized access to resource" +msgstr "" #: kallithea/controllers/error.py:101 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:104 -msgid "Unauthorized access to resource" -msgstr "" - -#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "您沒有權限瀏覽這個頁面" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:103 msgid "The resource could not be found" msgstr "找不到這個資源" -#: kallithea/controllers/error.py:110 +#: kallithea/controllers/error.py:105 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -102,12 +106,12 @@ msgstr "" #: kallithea/controllers/feed.py:89 -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 msgid "Changeset was too big and was cut off..." msgstr "" @@ -125,214 +129,289 @@ msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 -#: kallithea/controllers/files.py:428 +#: kallithea/controllers/files.py:194 +#, python-format +msgid "%s at %s" +msgstr "" + +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:313 +#: kallithea/controllers/files.py:318 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:324 +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:346 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 -#: kallithea/controllers/files.py:498 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:373 +#: kallithea/controllers/files.py:378 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:387 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:403 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "沒有修改" -#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/files.py:440 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:461 -msgid "No content" -msgstr "" - #: kallithea/controllers/files.py:465 +msgid "No content" +msgstr "" + +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:524 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "空的版本庫" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "未知的存檔類型" #: kallithea/controllers/files.py:775 -#: kallithea/templates/changeset/changeset_range.html:12 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:123 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:116 msgid "Changesets" msgstr "變更" -#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:13 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 #: kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:13 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "標籤" -#: kallithea/controllers/forks.py:191 +#: kallithea/controllers/forks.py:187 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:91 +#: kallithea/controllers/home.py:89 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/admin/repos/repo_add.html:15 -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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:73 kallithea/templates/base/base.html:90 -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:394 -#: kallithea/templates/base/base.html:565 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "版本庫" -#: kallithea/controllers/home.py:132 kallithea/templates/files/files.html:33 -#: kallithea/templates/files/files_add.html:37 -#: kallithea/templates/files/files_delete.html:37 -#: kallithea/templates/files/files_edit.html:37 +#: kallithea/controllers/home.py:130 +#: 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:138 +#: kallithea/controllers/home.py:136 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:144 +#: kallithea/controllers/home.py:142 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "public journal" msgstr "" -#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 -#: kallithea/templates/journal/journal.html:15 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 msgid "journal" msgstr "日誌" -#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +#: kallithea/controllers/login.py:188 kallithea/controllers/login.py:234 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:194 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:237 +#: kallithea/controllers/login.py:239 msgid "Your password reset link was sent" msgstr "您的密碼重設連結已寄出" -#: kallithea/controllers/login.py:257 +#: kallithea/controllers/login.py:260 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: kallithea/controllers/pullrequests.py:140 -#: kallithea/templates/changeset/changeset.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:15 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:157 -msgid "Special" +#: kallithea/controllers/pullrequests.py:130 +#, python-format +msgid "%s (closed)" msgstr "" #: kallithea/controllers/pullrequests.py:158 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/templates/email_templates/changeset_comment.html:17 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:179 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:822 #: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:13 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:330 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: kallithea/controllers/pullrequests.py:332 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:354 +#: kallithea/controllers/pullrequests.py:356 +#: kallithea/controllers/pullrequests.py:497 +#, fuzzy +msgid "No description" +msgstr "描述" + +#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:357 -msgid "Error occurred during sending pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:397 +#: kallithea/controllers/pullrequests.py:366 +#: kallithea/controllers/pullrequests.py:450 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:398 +msgid "Missing changesets since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:405 +#, python-format +msgid "New changesets on %s %s since the previous pull request:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:412 +msgid "Ancestor didn't change - show diff since previous version:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:419 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/controllers/pullrequests.py:421 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "" + +#: kallithea/controllers/pullrequests.py:456 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "" + +#: kallithea/controllers/pullrequests.py:464 +msgid "Pull request update created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:503 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:485 -msgid "Closing with" -msgstr "" - -#: kallithea/controllers/pullrequests.py:522 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" +#: kallithea/controllers/pullrequests.py:577 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:579 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:597 +#, python-format +msgid "This pull request can be updated with changes on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:600 +msgid "No changesets found for updating this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:608 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:614 +msgid "Git pull requests don't support updates yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:701 +#, fuzzy +msgid "Closing." +msgstr "使用中" #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -343,23 +422,24 @@ msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" #: kallithea/controllers/search.py:144 -msgid "An error occurred during this search operation" -msgstr "" - -#: kallithea/controllers/summary.py:203 -msgid "No data loaded yet" -msgstr "" - -#: kallithea/controllers/summary.py:206 -#: kallithea/templates/summary/summary.html:105 +msgid "An error occurred during search operation." +msgstr "" + +#: kallithea/controllers/summary.py:199 +#: kallithea/templates/summary/summary.html:387 +msgid "No data ready yet" +msgstr "" + +#: kallithea/controllers/summary.py:202 +#: kallithea/templates/summary/summary.html:101 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" -#: kallithea/controllers/admin/auth_settings.py:127 +#: kallithea/controllers/admin/auth_settings.py:125 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:138 +#: kallithea/controllers/admin/auth_settings.py:136 msgid "error occurred during update of auth settings" msgstr "" @@ -367,68 +447,68 @@ msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:111 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:288 +msgid "forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/my_account.py:239 #: kallithea/controllers/admin/users.py:289 -msgid "forever" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/my_account.py:240 #: kallithea/controllers/admin/users.py:290 -msgid "5 minutes" +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:241 #: kallithea/controllers/admin/users.py:291 -msgid "1 hour" +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/my_account.py:242 #: kallithea/controllers/admin/users.py:292 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:64 -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:293 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:68 -#: kallithea/controllers/admin/my_account.py:263 -#: kallithea/controllers/admin/users.py:295 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:294 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:147 +#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:185 +#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:233 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:263 +#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:268 +#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:271 +#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" @@ -437,62 +517,55 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:127 +#: kallithea/controllers/admin/my_account.py:128 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: kallithea/controllers/admin/my_account.py:141 -#: kallithea/controllers/admin/users.py:207 +#: kallithea/controllers/admin/my_account.py:143 +#: kallithea/controllers/admin/users.py:206 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:161 +#: kallithea/controllers/admin/my_account.py:162 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:171 +#: kallithea/controllers/admin/my_account.py:173 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:431 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:219 -#: kallithea/controllers/admin/users.py:438 +#: kallithea/controllers/admin/my_account.py:221 +#: kallithea/controllers/admin/users.py:437 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:228 -#: kallithea/controllers/admin/users.py:449 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:448 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:274 -#: kallithea/controllers/admin/users.py:315 +#: kallithea/controllers/admin/my_account.py:254 +#: kallithea/controllers/admin/users.py:314 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:286 -#: kallithea/controllers/admin/users.py:331 +#: kallithea/controllers/admin/my_account.py:266 +#: kallithea/controllers/admin/users.py:330 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:290 -#: kallithea/controllers/admin/users.py:335 +#: kallithea/controllers/admin/my_account.py:270 +#: kallithea/controllers/admin/users.py:334 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "無" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 @@ -508,28 +581,28 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 #: kallithea/controllers/admin/permissions.py:73 -#: kallithea/templates/admin/auth/auth_settings.html:12 -#: kallithea/templates/admin/defaults/defaults.html:12 -#: kallithea/templates/admin/permissions/permissions.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:12 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -#: kallithea/templates/admin/repos/repo_add.html:13 -#: kallithea/templates/admin/repos/repo_add.html:17 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/settings/settings.html:12 -#: kallithea/templates/admin/user_groups/user_group_add.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:13 -#: kallithea/templates/admin/users/user_add.html:11 -#: kallithea/templates/admin/users/user_edit.html:12 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 #: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/admin/users/users.html:13 -#: kallithea/templates/admin/users/users.html:58 -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:349 -#: kallithea/templates/base/base.html:350 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:255 +#: kallithea/templates/base/base.html:256 +#: kallithea/templates/base/base.html:262 +#: kallithea/templates/base/base.html:263 msgid "Admin" msgstr "管理" @@ -551,26 +624,26 @@ msgstr "" #: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1441 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1487 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1566 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1605 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1657 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1684 kallithea/model/db.py:1694 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1684 msgid "Manual activation of external account" msgstr "" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1442 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1488 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1567 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1606 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1658 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1685 kallithea/model/db.py:1695 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1685 msgid "Automatic activation of external account" msgstr "" @@ -586,21 +659,21 @@ msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:186 +#: kallithea/controllers/admin/repo_groups.py:184 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:198 +#: kallithea/controllers/admin/repo_groups.py:197 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:256 +#: kallithea/controllers/admin/repo_groups.py:255 #, python-format msgid "Updated repository group %s" msgstr "" @@ -630,182 +703,182 @@ msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 -#: kallithea/controllers/admin/repo_groups.py:454 -#: kallithea/controllers/admin/user_groups.py:337 +#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:455 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:434 +#: kallithea/controllers/admin/repo_groups.py:435 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:471 -#: kallithea/controllers/admin/repos.py:426 -#: kallithea/controllers/admin/user_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:472 +#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:162 +#: kallithea/controllers/admin/repos.py:163 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:237 +#: kallithea/controllers/admin/repos.py:238 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:246 +#: kallithea/controllers/admin/repos.py:247 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:249 +#: kallithea/controllers/admin/repos.py:250 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: kallithea/controllers/admin/repos.py:307 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:334 +#: kallithea/controllers/admin/repos.py:336 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:337 +#: kallithea/controllers/admin/repos.py:339 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:342 +#: kallithea/controllers/admin/repos.py:344 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:345 +#: kallithea/controllers/admin/repos.py:347 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: kallithea/controllers/admin/repos.py:350 +#: kallithea/controllers/admin/repos.py:352 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:402 +#: kallithea/controllers/admin/repos.py:406 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:458 +#: kallithea/controllers/admin/repos.py:462 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:472 +#: kallithea/controllers/admin/repos.py:476 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:492 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:522 -msgid "Updated repository visibility in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:526 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:530 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:535 kallithea/model/validators.py:340 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:550 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:552 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:555 +#: kallithea/controllers/admin/repos.py:559 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:571 +#: kallithea/controllers/admin/repos.py:575 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:574 +#: kallithea/controllers/admin/repos.py:578 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:577 -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:595 +#: kallithea/controllers/admin/repos.py:599 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:602 msgid "Locked" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:618 -msgid "Cache invalidation successful" -msgstr "" - #: kallithea/controllers/admin/repos.py:622 +msgid "Cache invalidation successful" +msgstr "" + +#: kallithea/controllers/admin/repos.py:626 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:641 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:640 +#: kallithea/controllers/admin/repos.py:644 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:673 +#: kallithea/controllers/admin/repos.py:677 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:172 +#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:176 +#: kallithea/controllers/admin/settings.py:174 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:180 #: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:215 -#, python-format -msgid "Repositories successfully rescanned added: %s ; removed: %s" +#: kallithea/controllers/admin/settings.py:213 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" #: kallithea/controllers/admin/settings.py:270 @@ -824,23 +897,23 @@ msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:373 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:400 +#: kallithea/controllers/admin/settings.py:404 msgid "Added new hook" msgstr "新增hook" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:418 msgid "Updated hooks" msgstr "更新hook" -#: kallithea/controllers/admin/settings.py:418 +#: kallithea/controllers/admin/settings.py:422 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:444 +#: kallithea/controllers/admin/settings.py:448 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" @@ -849,106 +922,114 @@ msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:161 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:199 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:221 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:239 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:244 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:437 -#: kallithea/controllers/admin/users.py:397 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:396 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:441 -#: kallithea/controllers/admin/users.py:401 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:400 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:135 +#: kallithea/controllers/admin/users.py:132 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:147 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:188 +#: kallithea/controllers/admin/users.py:186 msgid "User updated successfully" msgstr "使用者更新完成" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:228 +#: kallithea/controllers/admin/users.py:227 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:242 -#: kallithea/controllers/admin/users.py:260 -#: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/users.py:308 -#: kallithea/controllers/admin/users.py:321 -#: kallithea/controllers/admin/users.py:345 -#: kallithea/controllers/admin/users.py:408 -#: kallithea/controllers/admin/users.py:455 +#: kallithea/controllers/admin/users.py:241 +#: kallithea/controllers/admin/users.py:259 +#: kallithea/controllers/admin/users.py:282 +#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/users.py:407 +#: kallithea/controllers/admin/users.py:454 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:489 +#: kallithea/controllers/admin/users.py:488 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:503 +#: kallithea/controllers/admin/users.py:502 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:748 +#: kallithea/lib/auth.py:745 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:809 +#: kallithea/lib/auth.py:806 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: kallithea/lib/auth.py:846 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" +#: kallithea/lib/base.py:427 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:453 kallithea/lib/helpers.py:643 +msgid "Changeset not found" +msgstr "" + #: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" @@ -961,163 +1042,158 @@ msgid "No changes detected" msgstr "尚未有任何變更" -#: kallithea/lib/helpers.py:598 +#: kallithea/lib/helpers.py:627 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:601 +#: kallithea/lib/helpers.py:630 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:614 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/helpers.py:664 +#: kallithea/lib/helpers.py:693 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:670 +#: kallithea/lib/helpers.py:699 msgid "compare view" msgstr "" -#: kallithea/lib/helpers.py:690 +#: kallithea/lib/helpers.py:718 msgid "and" msgstr "和" -#: kallithea/lib/helpers.py:691 +#: kallithea/lib/helpers.py:719 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:720 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "修訂" -#: kallithea/lib/helpers.py:716 +#: kallithea/lib/helpers.py:744 #, python-format msgid "fork name %s" msgstr "" -#: kallithea/lib/helpers.py:733 -#: kallithea/templates/pullrequests/pullrequest_show.html:11 +#: kallithea/lib/helpers.py:761 #, python-format msgid "Pull request #%s" msgstr "" -#: kallithea/lib/helpers.py:743 -msgid "[deleted] repository" -msgstr "" - -#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 -msgid "[created] repository" -msgstr "" - -#: kallithea/lib/helpers.py:747 -msgid "[created] repository as fork" -msgstr "" - -#: kallithea/lib/helpers.py:749 kallithea/lib/helpers.py:759 -msgid "[forked] repository" -msgstr "" - -#: kallithea/lib/helpers.py:751 kallithea/lib/helpers.py:761 -msgid "[updated] repository" -msgstr "" - -#: kallithea/lib/helpers.py:753 -msgid "[downloaded] archive from repository" -msgstr "" - -#: kallithea/lib/helpers.py:755 -msgid "[delete] repository" -msgstr "" - -#: kallithea/lib/helpers.py:763 -msgid "[created] user" -msgstr "" - -#: kallithea/lib/helpers.py:765 -msgid "[updated] user" -msgstr "" - -#: kallithea/lib/helpers.py:767 -msgid "[created] user group" -msgstr "" - -#: kallithea/lib/helpers.py:769 -msgid "[updated] user group" -msgstr "" - #: kallithea/lib/helpers.py:771 -msgid "[commented] on revision in repository" -msgstr "" - -#: kallithea/lib/helpers.py:773 -msgid "[commented] on pull request for" +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:773 kallithea/lib/helpers.py:785 +msgid "[created] repository" msgstr "" #: kallithea/lib/helpers.py:775 -msgid "[closed] pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:777 -msgid "[pushed] into" -msgstr "" - -#: kallithea/lib/helpers.py:779 -msgid "[committed via Kallithea] into repository" +msgid "[created] repository as fork" +msgstr "" + +#: kallithea/lib/helpers.py:777 kallithea/lib/helpers.py:787 +msgid "[forked] repository" +msgstr "" + +#: kallithea/lib/helpers.py:779 kallithea/lib/helpers.py:789 +msgid "[updated] repository" msgstr "" #: kallithea/lib/helpers.py:781 -msgid "[pulled from remote] into repository" +msgid "[downloaded] archive from repository" msgstr "" #: kallithea/lib/helpers.py:783 +msgid "[delete] repository" +msgstr "" + +#: kallithea/lib/helpers.py:791 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:793 +msgid "[updated] user" +msgstr "" + +#: kallithea/lib/helpers.py:795 +msgid "[created] user group" +msgstr "" + +#: kallithea/lib/helpers.py:797 +msgid "[updated] user group" +msgstr "" + +#: kallithea/lib/helpers.py:799 +msgid "[commented] on revision in repository" +msgstr "" + +#: kallithea/lib/helpers.py:801 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:803 +msgid "[closed] pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:805 +msgid "[pushed] into" +msgstr "" + +#: kallithea/lib/helpers.py:807 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:809 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:811 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:813 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:815 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1101 +#: kallithea/lib/helpers.py:1144 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1105 +#: kallithea/lib/helpers.py:1148 msgid "No Files" msgstr "沒有檔案" -#: kallithea/lib/helpers.py:1171 +#: kallithea/lib/helpers.py:1214 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1174 +#: kallithea/lib/helpers.py:1217 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1177 +#: kallithea/lib/helpers.py:1220 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1180 +#: kallithea/lib/helpers.py:1223 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1185 +#: kallithea/lib/helpers.py:1228 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1417 +#: kallithea/lib/helpers.py:1460 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1125,68 +1201,98 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:425 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:426 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:427 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:428 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:429 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:430 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:446 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:448 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:450 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:453 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:456 msgid "just now" msgstr "現在" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1651 +msgid "Repository no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 kallithea/model/db.py:1652 +msgid "Repository read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 @@ -1196,12 +1302,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1661 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 kallithea/model/db.py:1653 +msgid "Repository write access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 @@ -1211,162 +1317,162 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 -msgid "Repository read access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1654 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 -msgid "Repository write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group read access" +msgid "Repository Group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 -msgid "Repository Group write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1649 +msgid "Kallithea Administrator" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -msgid "Repository Group admin access" +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1672 +msgid "Repository creation disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 kallithea/model/db.py:1673 +msgid "Repository creation enabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "Repository creation enabled" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1677 +msgid "Repository forking disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 kallithea/model/db.py:1678 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 -msgid "Register disabled" +msgid "Register new user with Kallithea with manual activation" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1204 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1324 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with Kallithea with auto activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 kallithea/model/db.py:2202 +msgid "Not Reviewed" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2203 +msgid "Approved" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 @@ -1376,12 +1482,12 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2212 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2204 +msgid "Rejected" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 @@ -1391,52 +1497,46 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2205 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1254 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1272 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1302 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1359 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1360 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1381 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1500 kallithea/model/db.py:1510 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1500 msgid "top level" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1656 +msgid "Repository group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1657 +msgid "Repository group read access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1445,8 +1545,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 -msgid "Repository group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1658 +msgid "Repository group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1457,23 +1557,10 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1667 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 kallithea/model/db.py:1659 +msgid "Repository group admin access" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 @@ -1481,8 +1568,19 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 -msgid "Repository group admin access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1661 +msgid "User group no access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1662 +msgid "User group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1492,8 +1590,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 -msgid "User group no access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1663 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1503,19 +1601,8 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 -msgid "User group write access" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1664 +msgid "User group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1525,21 +1612,21 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1666 msgid "Repository Group creation disabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1667 +msgid "Repository Group creation enabled" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1547,32 +1634,43 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1669 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 kallithea/model/db.py:1680 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1670 msgid "User Group creation enabled" msgstr "" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1680 +msgid "Registration disabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1681 +msgid "User Registration with manual account activation" +msgstr "" + #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1580,48 +1678,26 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1682 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1647 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1674 kallithea/model/db.py:1684 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1674 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1675 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/comment.py:77 +#: kallithea/model/comment.py:76 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:222 +#: kallithea/model/comment.py:231 kallithea/model/pull_request.py:164 msgid "[Mention]" msgstr "" @@ -1647,254 +1723,300 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:235 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:236 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:107 +#: kallithea/model/notification.py:296 +#, python-format +msgid "" +"Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:299 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "" + +#: kallithea/model/notification.py:301 +#, python-format +msgid "" +"Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(pr_username)s" +msgstr "" + +#: kallithea/model/notification.py:302 +#, python-format +msgid "" +"Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by " +"%(comment_username)s" +msgstr "" + +#: kallithea/model/notification.py:315 +#, fuzzy +msgid "Closing" +msgstr "使用中" + +#: kallithea/model/pull_request.py:132 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:810 +#: kallithea/model/scm.py:808 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:198 +#: kallithea/model/user.py:194 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:222 kallithea/model/user.py:247 +#: kallithea/model/user.py:214 kallithea/model/user.py:236 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:255 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: kallithea/model/user.py:276 +#: kallithea/model/user.py:261 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:268 +#, 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:275 #, 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:304 +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:305 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:333 +#: kallithea/model/user.py:328 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:334 +#: kallithea/model/user.py:329 #, python-format msgid "Your new Kallithea password:%s" msgstr "" -#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 +#: kallithea/model/validators.py:83 kallithea/model/validators.py:84 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:120 +#: kallithea/model/validators.py:101 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:122 +#: kallithea/model/validators.py:103 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: kallithea/model/validators.py:124 +#: kallithea/model/validators.py:105 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:151 +#: kallithea/model/validators.py:132 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:139 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:158 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:177 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:178 +#: kallithea/model/validators.py:159 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:180 +#: kallithea/model/validators.py:161 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:218 +#: kallithea/model/validators.py:199 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:219 +#: kallithea/model/validators.py:200 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:221 +#: kallithea/model/validators.py:202 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:260 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:294 +#: kallithea/model/validators.py:275 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:291 msgid "Passwords do not match" msgstr "密碼不相符" -#: kallithea/model/validators.py:327 +#: kallithea/model/validators.py:308 msgid "invalid password" msgstr "無效的密碼" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:309 msgid "invalid user name" msgstr "無效的使用者名稱" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:310 msgid "Your account is disabled" msgstr "您的帳號已被停用" -#: kallithea/model/validators.py:373 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: kallithea/model/validators.py:375 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:376 +#: kallithea/model/validators.py:357 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:378 +#: kallithea/model/validators.py:359 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:493 -msgid "invalid clone url" +#: kallithea/model/validators.py:474 +#, fuzzy +msgid "invalid clone URL" msgstr "無效的複製URL" -#: kallithea/model/validators.py:494 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" - -#: kallithea/model/validators.py:519 +#: kallithea/model/validators.py:475 +msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +msgstr "" + +#: kallithea/model/validators.py:500 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:534 +#: kallithea/model/validators.py:515 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:536 +#: kallithea/model/validators.py:517 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:585 +#: kallithea/model/validators.py:566 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:626 +#: kallithea/model/validators.py:607 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:700 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:715 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: kallithea/model/validators.py:754 +#: kallithea/model/validators.py:735 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: kallithea/model/validators.py:791 +#: kallithea/model/validators.py:772 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:804 +#: kallithea/model/validators.py:785 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: kallithea/model/validators.py:836 +#: kallithea/model/validators.py:817 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: kallithea/model/validators.py:837 +#: kallithea/model/validators.py:818 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:870 +#: kallithea/model/validators.py:851 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:884 +#: kallithea/model/validators.py:865 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:900 +#: kallithea/model/validators.py:881 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -1905,35 +2027,36 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:3 #: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:12 -#: kallithea/templates/admin/repos/repos.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:12 -#: kallithea/templates/admin/users/users.html:12 -#: kallithea/templates/bookmarks/bookmarks.html:12 -#: kallithea/templates/branches/branches.html:12 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 #: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/journal/journal.html:50 -#: kallithea/templates/tags/tags.html:12 +#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "快速過濾..." #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "個版本庫" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/admin/repos/repo_add.html:22 -#: kallithea/templates/admin/repos/repos.html:25 +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" #: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" @@ -1950,164 +2073,165 @@ msgstr "" #: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:131 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:72 -#: kallithea/templates/admin/repos/repos.html:51 -#: kallithea/templates/admin/user_groups/user_group_add.html:43 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/user_groups/user_groups.html:47 #: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request.html:9 -#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 #: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:86 -#: kallithea/templates/summary/summary.html:88 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:84 msgid "Description" msgstr "描述" -#: kallithea/templates/index_base.html:126 +#: kallithea/templates/index_base.html:129 #: kallithea/templates/admin/my_account/my_account_repos.html:46 #: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 #: kallithea/templates/admin/repos/repo_add_base.html:9 #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 #: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks.html:49 #: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:50 +#: kallithea/templates/branches/branches.html:49 #: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:41 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:288 -#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 #: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "名稱" -#: kallithea/templates/index_base.html:129 +#: kallithea/templates/index_base.html:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:131 +#: kallithea/templates/index_base.html:134 #: kallithea/templates/admin/my_account/my_account_repos.html:48 #: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:133 +#: kallithea/templates/index_base.html:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 #: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/admin/repos/repos.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:54 -#: kallithea/templates/summary/summary.html:141 +#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/summary/summary.html:137 msgid "Owner" msgstr "擁有者" -#: kallithea/templates/index_base.html:141 +#: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:57 #: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:67 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:299 -#: kallithea/templates/tags/tags.html:81 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "" -#: kallithea/templates/index_base.html:142 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:68 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:209 -#: kallithea/templates/journal/journal.html:300 -#: kallithea/templates/tags/tags.html:82 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:143 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:70 -#: kallithea/templates/bookmarks/bookmarks.html:84 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:211 -#: kallithea/templates/journal/journal.html:302 -#: kallithea/templates/tags/tags.html:84 -msgid "Data error." -msgstr "" - #: kallithea/templates/index_base.html:145 +#: kallithea/templates/admin/my_account/my_account_repos.html:58 +#: kallithea/templates/admin/my_account/my_account_watched.html:58 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/index_base.html:146 +msgid "No repositories found." +msgstr "" + +#: kallithea/templates/index_base.html:147 +#: kallithea/templates/admin/my_account/my_account_repos.html:60 +#: kallithea/templates/admin/my_account/my_account_watched.html:60 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 +msgid "Data error." +msgstr "" + +#: kallithea/templates/index_base.html:148 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:151 kallithea/templates/base/root.html:71 -#: kallithea/templates/bookmarks/bookmarks.html:85 -#: kallithea/templates/branches/branches.html:84 -#: kallithea/templates/journal/journal.html:212 -#: kallithea/templates/journal/journal.html:303 -#: kallithea/templates/tags/tags.html:85 +#: kallithea/templates/base/base.html:143 kallithea/templates/base/root.html:48 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "" -#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:329 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:30 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 +#: kallithea/templates/login.html:27 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:30 -#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:33 -#: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:305 msgid "Username" msgstr "帳號" -#: kallithea/templates/login.html:52 kallithea/templates/register.html:49 -#: kallithea/templates/admin/my_account/my_account.html:39 -#: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:255 +#: kallithea/templates/login.html:36 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:314 msgid "Password" msgstr "密碼" -#: kallithea/templates/login.html:62 +#: kallithea/templates/login.html:46 msgid "Remember me" msgstr "" -#: kallithea/templates/login.html:66 +#: kallithea/templates/login.html:50 msgid "Sign In" msgstr "登入" -#: kallithea/templates/login.html:72 +#: kallithea/templates/login.html:56 msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 +#: kallithea/templates/login.html:59 kallithea/templates/base/base.html:325 msgid "Don't have an account ?" msgstr "沒有帳號?" @@ -2115,78 +2239,84 @@ msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:29 -#, python-format -msgid "Reset your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:31 -msgid "Reset your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:42 +#: kallithea/templates/password_reset.html:12 +#, fuzzy, python-format +msgid "Reset Your Password to %s" +msgstr "忘記您的密碼?" + +#: kallithea/templates/password_reset.html:14 +#, fuzzy +msgid "Reset Your Password" +msgstr "忘記您的密碼?" + +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:52 -#: kallithea/templates/register.html:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:63 -msgid "Send password reset email" -msgstr "" - -#: kallithea/templates/password_reset.html:64 -msgid "Password reset link will be sent to matching email address" +#: kallithea/templates/password_reset.html:46 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +#, fuzzy +msgid "" +"Password reset link will be sent to the email address matching your " +"username." msgstr "密碼重設連結已郵寄至您的信箱" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 -#: kallithea/templates/register.html:106 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "登入" -#: kallithea/templates/register.html:28 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:58 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "確認密碼" -#: kallithea/templates/register.html:67 -#: kallithea/templates/admin/my_account/my_account_profile.html:41 -#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:59 #: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "名" -#: kallithea/templates/register.html:76 -#: kallithea/templates/admin/my_account/my_account_profile.html:50 -#: kallithea/templates/admin/users/user_add.html:71 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/users/user_add.html:68 #: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "姓" -#: kallithea/templates/register.html:85 -#: kallithea/templates/admin/my_account/my_account_profile.html:59 -#: kallithea/templates/admin/settings/settings.html:44 -#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:77 #: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Email" msgstr "電子郵件" -#: kallithea/templates/register.html:108 -msgid "Your account will be activated right after registration" -msgstr "您的帳號註冊後將會啟用" - -#: kallithea/templates/register.html:110 -msgid "Your account must wait for activation by administrator" -msgstr "您的帳號註冊後將等待管理員啟用" +#: kallithea/templates/register.html:92 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:94 +msgid "Please wait for an administrator to activate your account." +msgstr "" #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:67 +#: kallithea/templates/branches/branches_data.html:69 msgid "There are no branches yet" msgstr "沒有任何分支" @@ -2205,37 +2335,39 @@ msgstr "" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:72 -msgid "Admin journal" +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:59 +#, fuzzy +msgid "Admin Journal" msgstr "管理員日誌" +#: kallithea/templates/admin/admin.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:11 +#, fuzzy +msgid "Filter" +msgstr "檔案" + #: kallithea/templates/admin/admin.html:13 -msgid "journal filter..." -msgstr "" - -#: kallithea/templates/admin/admin.html:15 -#: kallithea/templates/journal/journal.html:14 -msgid "filter" -msgstr "" - -#: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/journal/journal.html:15 -#, python-format -msgid "%s entry" -msgid_plural "%s entries" +#: kallithea/templates/journal/journal.html:12 +#, fuzzy, python-format +msgid "%s Entry" +msgid_plural "%s Entries" msgstr[0] "" #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:50 #: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:54 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:55 -#: kallithea/templates/admin/user_groups/user_groups.html:55 -#: kallithea/templates/admin/users/users.html:60 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "動作" @@ -2245,11 +2377,11 @@ msgstr "版本庫" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:51 #: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches.html:51 #: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags.html:51 #: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "時間" @@ -2266,160 +2398,161 @@ msgid "Authentication Settings" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:78 +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:28 +msgid "Authentication Plugins" +msgstr "" + #: kallithea/templates/admin/auth/auth_settings.html:31 -msgid "Authentication Plugins" +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:33 +msgid "" +"Comma separated list of plugins. Order of plugins is also order in which " +"Kallithea will try to authenticate user" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 -msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:36 -msgid "" -"Comma separated list of plugins. Order of plugins is also order in which " -"Kallithea will try to authenticate user" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:37 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:40 msgid "enabled" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/base/root.html:41 msgid "disabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:51 -#: kallithea/templates/admin/defaults/defaults.html:87 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:84 #: kallithea/templates/admin/my_account/my_account_password.html:33 -#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: kallithea/templates/admin/my_account/my_account_profile.html:70 #: kallithea/templates/admin/permissions/permissions_globals.html:108 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:72 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101 #: kallithea/templates/admin/repos/repo_edit_settings.html:134 #: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:60 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:67 -#: kallithea/templates/admin/users/user_add.html:99 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 #: kallithea/templates/admin/users/user_edit_profile.html:122 #: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "儲存" -#: kallithea/templates/admin/auth/auth_settings.html:57 -msgid "Plugin" -msgstr "" - #: kallithea/templates/admin/defaults/defaults.html:5 -#: kallithea/templates/admin/defaults/defaults.html:28 -msgid "Repositories defaults" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:79 +#: kallithea/templates/admin/defaults/defaults.html:25 +#, fuzzy +msgid "Repository Defaults" +msgstr "個版本庫" + +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:66 msgid "Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:38 +#: kallithea/templates/admin/defaults/defaults.html:35 #: kallithea/templates/admin/repos/repo_add_base.html:59 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "類型" -#: kallithea/templates/admin/defaults/defaults.html:47 +#: kallithea/templates/admin/defaults/defaults.html:44 #: kallithea/templates/admin/repos/repo_add_base.html:77 #: kallithea/templates/admin/repos/repo_edit_settings.html:82 -#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Private repository" msgstr "私有的版本庫" -#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/defaults/defaults.html:48 #: kallithea/templates/admin/repos/repo_add_base.html:81 #: kallithea/templates/admin/repos/repo_edit_settings.html:86 -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/defaults/defaults.html:55 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "啟用統計" -#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/defaults/defaults.html:65 #: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "啟用下載" -#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/defaults/defaults.html:69 #: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:78 +#: kallithea/templates/admin/defaults/defaults.html:75 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 #: kallithea/templates/admin/repos/repo_edit_settings.html:109 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/defaults/defaults.html:79 #: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "" #: kallithea/templates/admin/gists/edit.html:5 -#: kallithea/templates/admin/gists/edit.html:22 +#: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:40 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/new.html:43 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 +msgid "Gist lifetime" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/new.html:45 -msgid "Gist lifetime" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/edit.html:67 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/index.html:62 -#: kallithea/templates/admin/gists/show.html:50 -#: kallithea/templates/admin/gists/show.html:52 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/gists/show.html:49 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:65 -#: kallithea/templates/admin/gists/index.html:60 -#: kallithea/templates/admin/gists/show.html:50 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27 #: kallithea/templates/admin/users/user_edit_api_keys.html:8 @@ -2427,75 +2560,69 @@ msgid "never" msgstr "" -#: kallithea/templates/admin/gists/edit.html:80 -#: kallithea/templates/admin/gists/new.html:52 -#: kallithea/templates/files/files_add.html:59 -#: kallithea/templates/files/files_edit.html:64 -msgid "plain" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:148 +#: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:89 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 -#: kallithea/templates/admin/gists/index.html:19 -#, python-format -msgid "Private Gists for user %s" +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 -#: kallithea/templates/admin/gists/index.html:21 -#, python-format -msgid "Public Gists for user %s" +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#: kallithea/templates/admin/gists/index.html:23 +#: kallithea/templates/admin/gists/index.html:20 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:40 -#: kallithea/templates/admin/gists/show.html:28 +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:240 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:54 #: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:77 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:22 +#: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:51 +#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" -#: kallithea/templates/admin/gists/new.html:60 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:61 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:62 +#: kallithea/templates/admin/gists/new.html:58 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70 #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_password.html:34 -#: kallithea/templates/admin/my_account/my_account_profile.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:71 #: kallithea/templates/admin/permissions/permissions_globals.html:109 #: kallithea/templates/admin/permissions/permissions_ips.html:41 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 @@ -2503,119 +2630,115 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:59 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102 #: kallithea/templates/admin/repos/repo_edit_settings.html:135 -#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_global.html:57 #: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_visual.html:117 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 #: kallithea/templates/admin/users/user_edit_api_keys.html:70 #: kallithea/templates/admin/users/user_edit_emails.html:46 #: kallithea/templates/admin/users/user_edit_ips.html:50 #: kallithea/templates/admin/users/user_edit_profile.html:123 #: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:70 -#: kallithea/templates/files/files_delete.html:58 -#: kallithea/templates/files/files_edit.html:73 -#: kallithea/templates/pullrequests/pullrequest.html:83 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "重設" #: kallithea/templates/admin/gists/show.html:5 -#: kallithea/templates/admin/gists/show.html:12 +#: kallithea/templates/admin/gists/show.html:9 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:13 -#: kallithea/templates/email_templates/changeset_comment.html:4 -#: kallithea/templates/email_templates/pull_request.html:4 -#: kallithea/templates/email_templates/pull_request_comment.html:4 +#: kallithea/templates/admin/gists/show.html:10 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" -#: kallithea/templates/admin/gists/show.html:40 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:42 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:59 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:48 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:76 +#: kallithea/templates/changeset/changeset_file_comment.html:50 #: kallithea/templates/files/files_source.html:39 #: kallithea/templates/files/files_source.html:42 #: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "移除" -#: kallithea/templates/admin/gists/show.html:59 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:66 -#: kallithea/templates/changeset/changeset_file_comment.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:207 #: kallithea/templates/data_table/_dt_elements.html:167 #: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 #: kallithea/templates/files/files_source.html:41 #: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "" -#: kallithea/templates/admin/gists/show.html:68 -#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 #: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:76 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:89 -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:285 -msgid "My account" -msgstr "我的帳號" - -#: kallithea/templates/admin/my_account/my_account.html:12 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:346 msgid "My Account" msgstr "我的帳號" +#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "API Keys" +msgstr "" + #: kallithea/templates/admin/my_account/my_account.html:38 -#: kallithea/templates/admin/users/user_edit.html:42 -msgid "Profile" +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:39 +msgid "My Repositories" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/admin/users/user_edit.html:43 -msgid "API keys" +#: kallithea/templates/journal/journal.html:53 +msgid "Watched" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:41 -msgid "My Emails" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:42 -msgid "My Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:43 -#: kallithea/templates/journal/journal.html:54 -msgid "Watched" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:44 -msgid "Pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:45 -msgid "My permissions" -msgstr "" +#, fuzzy +msgid "My Permissions" +msgstr "權限" #: kallithea/templates/admin/my_account/my_account_api_keys.html:6 #: kallithea/templates/admin/users/user_edit_api_keys.html:6 @@ -2685,7 +2808,6 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:24 #: kallithea/templates/admin/permissions/permissions_ips.html:14 #: kallithea/templates/admin/repos/repo_edit_fields.html:18 #: kallithea/templates/admin/settings/settings_hooks.html:36 @@ -2706,7 +2828,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:26 #: kallithea/templates/admin/users/user_edit_emails.html:26 -msgid "No additional emails specified" +msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:38 @@ -2715,8 +2837,9 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:1 -msgid "Change your account password" -msgstr "" +#, fuzzy +msgid "Change Your Account Password" +msgstr "忘記您的密碼?" #: kallithea/templates/admin/my_account/my_account_password.html:7 msgid "Current password" @@ -2731,115 +2854,76 @@ msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:9 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "修改您的頭像於" -#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/my_account/my_account_profile.html:12 #: kallithea/templates/admin/users/user_edit_profile.html:9 msgid "Using" msgstr "使用中" -#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/my_account/my_account_profile.html:14 #: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:13 +#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/my_account/my_account_profile.html:16 #: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "current IP" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:26 +#: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" "Your user is in an external Source of Record; some details cannot be " "managed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:30 -#: kallithea/templates/pullrequests/pullrequest_show.html:45 -msgid "Closed" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 -msgid "Confirm to delete this pull request" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 -msgid "Nothing here yet" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 -msgid "I participate in" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -msgid "Repositories you are owner of" -msgstr "" +#, fuzzy +msgid "Repositories You Own" +msgstr "個版本庫" #: kallithea/templates/admin/my_account/my_account_repos.html:59 #: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:69 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:210 -#: kallithea/templates/journal/journal.html:301 -#: kallithea/templates/tags/tags.html:83 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 -msgid "Repositories you are watching" -msgstr "" +#, fuzzy +msgid "Repositories You are Watching" +msgstr "版本庫路徑" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:12 +#: kallithea/templates/admin/notifications/notifications.html:9 msgid "My Notifications" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:32 +#: kallithea/templates/admin/notifications/notifications.html:24 msgid "All" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:33 +#: kallithea/templates/admin/notifications/notifications.html:25 msgid "Comments" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/admin/notifications/notifications.html:26 +#: kallithea/templates/base/base.html:186 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:38 -msgid "Mark all read" +#: kallithea/templates/admin/notifications/notifications.html:30 +msgid "Mark All Read" msgstr "" #: kallithea/templates/admin/notifications/notifications_data.html:40 @@ -2847,38 +2931,39 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:14 -msgid "Show notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:284 +#: kallithea/templates/admin/notifications/show_notification.html:11 +msgid "Show Notification" +msgstr "" + +#: kallithea/templates/admin/notifications/show_notification.html:9 +#: kallithea/templates/base/base.html:345 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" +#, fuzzy +msgid "Permissions Administration" msgstr "權限管理員" -#: kallithea/templates/admin/permissions/permissions.html:14 -#: kallithea/templates/admin/permissions/permissions.html:37 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:46 -#: kallithea/templates/admin/user_groups/user_group_edit.html:45 -#: kallithea/templates/base/base.html:77 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/base/base.html:64 msgid "Permissions" msgstr "權限" -#: kallithea/templates/admin/permissions/permissions.html:41 -#: kallithea/templates/admin/settings/settings.html:42 +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 msgid "Global" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:42 -msgid "IP whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:43 +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:30 msgid "Overview" msgstr "" @@ -2889,8 +2974,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without need to log in. Anonymous users use %s " -"user permissions" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2910,7 +2995,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:41 #: kallithea/templates/admin/repos/repo_edit_settings.html:42 #: kallithea/templates/data_table/_dt_elements.html:204 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "版本庫群組" @@ -2943,8 +3028,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside" -" that group" +"Write permission to a repository group allows creating repositories " +"inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2964,7 +3049,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:1 -msgid "Default ip whitelist for all users" +msgid "Default IP Whitelist for All Users" msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:15 @@ -2975,7 +3060,7 @@ #: kallithea/templates/admin/permissions/permissions_ips.html:21 #: kallithea/templates/admin/users/user_edit_ips.html:30 -msgid "All IP addresses are allowed" +msgid "All IP addresses are allowed." msgstr "" #: kallithea/templates/admin/permissions/permissions_ips.html:32 @@ -2984,68 +3069,64 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_perms.html:1 -msgid "Default user permissions overview" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_add.html:36 +#, fuzzy +msgid "Default User Permissions Overview" +msgstr "預設權限" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:35 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "群組名稱" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:54 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "父群組" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 #: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:67 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 #: kallithea/templates/admin/repos/repo_add_base.html:54 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, python-format -msgid "%s Repository group settings" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:14 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -msgid "Repository Groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:24 +#, fuzzy, python-format +msgid "%s Repository Group Settings" +msgstr "版本庫群組" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:53 -#: kallithea/templates/admin/repos/repo_edit.html:15 -#: kallithea/templates/admin/repos/repo_edit.html:43 -#: kallithea/templates/admin/settings/settings.html:14 -#: kallithea/templates/admin/settings/settings.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit.html:42 -#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:154 +#: kallithea/templates/data_table/_dt_elements.html:43 +#: kallithea/templates/data_table/_dt_elements.html:47 msgid "Settings" msgstr "設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit.html:43 -#: kallithea/templates/admin/users/user_edit.html:44 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:31 msgid "Advanced" msgstr "" @@ -3069,7 +3150,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:94 +#: kallithea/templates/pullrequests/pullrequest_show.html:147 msgid "Created on" msgstr "" @@ -3167,57 +3248,61 @@ " groups and repositories inside" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#, fuzzy +msgid "Confirm to delete this group" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 msgid "Home" msgstr "首頁" -#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:13 -msgid "repository groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_groups.html:52 -msgid "Number of toplevel repositories" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:5 -msgid "Add repository" -msgstr "新增版本庫" +#, fuzzy +msgid "Repository Groups Administration" +msgstr "版本庫管理員" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#, fuzzy +msgid "Number of Top-level Repositories" +msgstr "建立版本庫" #: kallithea/templates/admin/repos/repo_add_base.html:14 msgid "Import existing repository ?" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:23 -#: kallithea/templates/summary/summary.html:32 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "複製由" #: kallithea/templates/admin/repos/repo_add_base.html:27 -msgid "Optional http[s] url from which repository should be cloned." +msgid "Optional URL from which repository should be cloned." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 -#: kallithea/templates/forks/fork.html:45 +#: kallithea/templates/forks/fork.html:42 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/templates/forks/fork.html:55 -msgid "Optionaly select a group to put this repository into." +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/forks/fork.html:52 +msgid "Optionally select a group to put this repository into." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:63 @@ -3226,7 +3311,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:68 #: kallithea/templates/admin/repos/repo_edit_settings.html:51 -#: kallithea/templates/forks/fork.html:61 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "" @@ -3237,162 +3322,173 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, python-format -msgid "%s Creating repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_creating.html:16 +#, fuzzy, python-format +msgid "%s Creating Repository" +msgstr "私有版本庫" + +#: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:30 +#: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" -#: kallithea/templates/admin/repos/repo_creating.html:42 +#: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, python-format -msgid "%s repository settings" +#, fuzzy, python-format +msgid "%s Repository Settings" +msgstr "版本庫建立" + +#: kallithea/templates/admin/repos/repo_edit.html:49 +msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:52 -msgid "Extra fields" +msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:55 -msgid "Caches" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "遠端" -#: kallithea/templates/admin/repos/repo_edit.html:61 -#: kallithea/templates/summary/statistics.html:11 -#: kallithea/templates/summary/summary.html:178 -#: kallithea/templates/summary/summary.html:179 +#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/templates/summary/summary.html:175 msgid "Statistics" msgstr "統計" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/templates/summary/summary.html:25 -msgid "Fork of" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:6 +#, fuzzy +msgid "Parent" +msgstr "父群組" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:10 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:24 -msgid "Public journal visibility" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#, fuzzy +msgid "Public Journal Visibility" +msgstr "公開日誌" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:30 msgid "Remove from public journal" msgstr "從公開日誌移除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -msgid "Add to public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:43 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:35 +#, fuzzy +msgid "Add to Public Journal" +msgstr "公開日誌" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:41 msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:49 -msgid "Change locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Unlock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 -msgid "Confirm to lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 -msgid "Lock repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:47 +#, fuzzy +msgid "Change Locking" +msgstr "修改紀錄" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:53 +#, fuzzy +msgid "Confirm to unlock repository." +msgstr "確認廢止版本庫快取" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:55 +#, fuzzy +msgid "Unlock Repository" +msgstr "公開的版本庫" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:61 +#, fuzzy +msgid "Confirm to lock repository." +msgstr "確認廢止版本庫快取" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#, fuzzy +msgid "Lock Repository" +msgstr "公開的版本庫" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:65 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 msgid "" -"Force locking on repository. Works only when anonymous access is " -"disabled. Triggering a pull locks repository by user who pulled, only the " -"same user can unlock by doing a push" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:83 +"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:80 #: kallithea/templates/data_table/_dt_elements.html:132 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:82 +#, fuzzy +msgid "Delete this Repository" +msgstr "公開的版本庫" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:85 -msgid "Delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#, python-format -msgid "this repository has %s fork" -msgid_plural "this repository has %s forks" +#, fuzzy, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" msgstr[0] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:87 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 msgid "" -"This repository will be renamed in a special way in order to be " -"inaccessible for Kallithea and VCS systems. If you need to fully delete it" -" from file system please do it manually" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" -msgstr "" +#, fuzzy +msgid "Invalidate Repository Cache" +msgstr "確認廢止版本庫快取" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache" +#, fuzzy +msgid "Confirm to invalidate repository cache." msgstr "確認廢止版本庫快取" #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3405,12 +3501,12 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:52 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:53 -#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:88 #: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "啟用" @@ -3444,7 +3540,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:66 -msgid "Extra fields are disabled" +msgid "Extra fields are disabled." msgstr "" #: kallithea/templates/admin/repos/repo_edit_permissions.html:21 @@ -3452,19 +3548,20 @@ msgstr "私有版本庫" #: kallithea/templates/admin/repos/repo_edit_remote.html:3 -msgid "Remote url" +#, fuzzy +msgid "Remote URL" +msgstr "複製連結" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:8 +msgid "Pull Changes from Remote Location" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Pull changes from remote location" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:8 -msgid "Confirm to pull changes from remote side" +msgid "Confirm to pull changes from remote side." msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:14 -msgid "This repository does not have any remote url set" +msgid "This repository does not have a remote URL set." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 @@ -3472,7 +3569,7 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:11 -msgid "what is that ?" +msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:13 @@ -3482,16 +3579,18 @@ #: 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 above url guarantees that this " -"repository will always be accessible under such url.\n" -" Useful for CI systems, or any other cases" -" that you need to hardcode the url into 3rd party service." +"repository URL changes.\n" +" Using the above URL guarantees that this " +"repository will always be accessible under such URL.\n" +" Useful for CI systems, or any other cases " +"that you need to hardcode the URL into 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 -msgid "Clone uri" -msgstr "複製URL" +#: kallithea/templates/summary/summary.html:72 +#, fuzzy +msgid "Clone URL" +msgstr "複製連結" #: kallithea/templates/admin/repos/repo_edit_settings.html:27 #: kallithea/templates/base/perms_summary.html:43 @@ -3511,15 +3610,10 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:37 -msgid "http[s] url used for doing remote pulls." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 -msgid "Optionally select a group to put this repository into." +msgid "URL used for doing remote pulls." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" @@ -3536,47 +3630,51 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Reset statistics" -msgstr "" +#, fuzzy +msgid "Reset Statistics" +msgstr "啟用統計" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 -msgid "Confirm to remove current statistics" +#, fuzzy +msgid "Confirm to remove current statistics." msgstr "確認移除目前的統計" #: kallithea/templates/admin/repos/repos.html:5 -msgid "Repositories administration" +#, fuzzy +msgid "Repositories Administration" msgstr "版本庫管理員" -#: kallithea/templates/admin/repos/repos.html:54 +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 -msgid "Settings administration" +#, fuzzy +msgid "Settings Administration" msgstr "設定管理員" -#: kallithea/templates/admin/settings/settings.html:40 +#: kallithea/templates/admin/settings/settings.html:27 msgid "VCS" msgstr "" -#: kallithea/templates/admin/settings/settings.html:41 -msgid "Remap and rescan" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:43 +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" msgstr "" -#: kallithea/templates/admin/settings/settings.html:45 +#: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings.html:46 -msgid "Full text search" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:47 +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 msgid "System Info" msgstr "" @@ -3645,35 +3743,42 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Google Analytics code" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "Analytics HTML block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:31 +msgid "" +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:46 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " -"on registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:115 -msgid "Save settings" +#: kallithea/templates/admin/settings/settings_visual.html:116 +#, fuzzy +msgid "Save Settings" msgstr "儲存設定" #: kallithea/templates/admin/settings/settings_hooks.html:1 -msgid "Built in Mercurial hooks - read only" +msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:15 @@ -3683,10 +3788,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom hooks" +#, fuzzy +msgid "Custom Hooks" msgstr "自訂hook" -#: kallithea/templates/admin/settings/settings_hooks.html:69 +#: kallithea/templates/admin/settings/settings_hooks.html:68 msgid "Failed to remove hook" msgstr "移除hook失敗" @@ -3700,9 +3806,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"In case a repository was deleted from filesystem and it still exists in " -"the database check this option to scan obsolete data in database and " -"remove it." +"Check this option to remove references to repositories that no longer " +"exist in on the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3710,19 +3815,17 @@ msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:19 -msgid "" -"Each cache data for repositories will be cleaned with this option " -"selected. Use this to reload data and clear cache keys." +msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install GIT hooks" +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current" -" hooks will be updated to latest version" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3739,7 +3842,7 @@ #: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"This option completely reindexes all the files within Kallithea for proper " +"This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -3764,11 +3867,11 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "GIT version" +msgid "Git version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "GIT path" +msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 @@ -3776,7 +3879,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Note: please make sure this server can access this url" +msgid "Note: please make sure this server can access this URL" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:14 @@ -3784,7 +3887,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:22 -msgid "Python packages" +msgid "Python Packages" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:6 @@ -3797,8 +3900,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:13 msgid "" -"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " -"certificate is missing it will return an HTTP Error 406: Not Acceptable." +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3818,8 +3921,9 @@ msgstr "push後更新版本庫 (hg update)" #: kallithea/templates/admin/settings/settings_vcs.html:42 -msgid "Mercurial Extensions" -msgstr "" +#, fuzzy +msgid "Mercurial extensions" +msgstr "Mercurial 版本庫" #: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "Enable largefiles extension" @@ -3831,13 +3935,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library to be installed. Allows cloning remote SVN " -"repositories and migrates them to Mercurial type." +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" -msgstr "版本庫路徑" +#, fuzzy +msgid "Location of repositories" +msgstr "建立版本庫" #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" @@ -3847,8 +3952,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing " -"this value a restart and rescan of the repository folder are required." +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3877,8 +3982,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" -"Gravatar url allows you to use other avatar server application.\n" -" Following " +"Gravatar URL allows you to use another avatar server application.\n" +" The following " "variables of the URL will be replaced accordingly.\n" " {scheme} " "'http' or 'https' sent from running Kallithea server,\n" @@ -3894,8 +3999,10 @@ #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," -" available vars:\n" +"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 " @@ -3908,71 +4015,72 @@ "repository, can be used to contruct clone-by-id" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:58 +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" "Number of items displayed in the main page dashboard before pagination is" " shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:64 +#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:74 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:79 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:83 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repo icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:85 -msgid "Show public/private icons next to repositories names." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:91 +#: kallithea/templates/admin/settings/settings_visual.html:86 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta-Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:96 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:110 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_add.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:28 +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -3982,19 +4090,14 @@ msgid "%s user group settings" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit.html:14 -msgid "User Groups" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_group_edit.html:44 -#: kallithea/templates/admin/users/user_edit.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Default permissions" msgstr "預設權限" -#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "成員" @@ -4013,7 +4116,7 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "" @@ -4021,23 +4124,16 @@ msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:43 -msgid "Remove all elements" -msgstr "移除所有元素" - -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:53 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "啟用的成員" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:56 -msgid "Add all elements" -msgstr "新增索有元素" - #: kallithea/templates/admin/user_groups/user_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/user_groups/user_groups.html:13 +#, fuzzy +msgid "User Groups Administration" +msgstr "使用者管理員" + +#: kallithea/templates/admin/user_groups/user_groups.html:10 msgid "user groups" msgstr "" @@ -4045,18 +4141,19 @@ msgid "Add user" msgstr "新增使用者" -#: kallithea/templates/admin/users/user_add.html:13 -#: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "使用者" -#: kallithea/templates/admin/users/user_add.html:15 -#: kallithea/templates/admin/users/users.html:27 +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:53 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "" @@ -4065,14 +4162,15 @@ msgid "%s user settings" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:46 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +msgid "Default Permissions" +msgstr "預設權限" + +#: kallithea/templates/admin/users/user_edit.html:33 msgid "Emails" msgstr "" -#: kallithea/templates/admin/users/user_edit.html:47 -msgid "Ip whitelist" -msgstr "" - #: kallithea/templates/admin/users/user_edit_advanced.html:1 #, python-format msgid "User: %s" @@ -4084,6 +4182,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4130,193 +4229,184 @@ msgstr "" #: kallithea/templates/admin/users/users.html:5 -msgid "Users administration" +#, fuzzy +msgid "Users Administration" msgstr "使用者管理員" -#: kallithea/templates/admin/users/users.html:13 -msgid "users" -msgstr "使用者" - -#: kallithea/templates/admin/users/users.html:54 -msgid "Firstname" -msgstr "" - -#: kallithea/templates/admin/users/users.html:55 -msgid "Lastname" -msgstr "" - #: kallithea/templates/admin/users/users.html:56 -msgid "Last login" -msgstr "" - -#: kallithea/templates/admin/users/users.html:59 -msgid "Auth type" -msgstr "" - -#: kallithea/templates/base/base.html:37 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:49 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:134 -msgid "Create fork" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:122 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:133 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 -#: kallithea/templates/summary/summary.html:11 +#: kallithea/templates/summary/summary.html:8 msgid "Summary" msgstr "概況" -#: kallithea/templates/base/base.html:146 -#: kallithea/templates/changelog/changelog.html:17 +#: kallithea/templates/base/base.html:135 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/changelog/changelog.html:14 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "修改紀錄" -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:139 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/templates/files/files.html:15 +#: kallithea/templates/files/files.html:11 msgid "Files" msgstr "檔案" -#: kallithea/templates/base/base.html:149 +#: kallithea/templates/base/base.html:141 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:158 +#: kallithea/templates/base/base.html:148 +#: kallithea/templates/base/base.html:150 msgid "Options" msgstr "選項" -#: kallithea/templates/base/base.html:166 +#: kallithea/templates/base/base.html:158 #: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:13 +#: kallithea/templates/branches/branches.html:56 +#: kallithea/templates/branches/branches_data.html:13 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:13 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:250 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:54 +msgid "Search" +msgstr "搜尋" + +#: kallithea/templates/base/base.html:166 +msgid "Unlock" msgstr "" #: kallithea/templates/base/base.html:168 -#: kallithea/templates/bookmarks/bookmarks.html:58 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:57 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:58 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "" - -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/search/search.html:17 -#: kallithea/templates/search/search.html:57 -msgid "Search" -msgstr "搜尋" - -#: kallithea/templates/base/base.html:174 -msgid "Unlock" +msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:176 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:177 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:188 +#: kallithea/templates/base/base.html:180 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 -#: kallithea/templates/forks/fork.html:12 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "分支" -#: kallithea/templates/base/base.html:190 +#: kallithea/templates/base/base.html:181 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:186 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:233 -msgid "Not logged in" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "Login to your account" -msgstr "" - -#: kallithea/templates/base/base.html:263 +#: kallithea/templates/base/base.html:224 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:225 +#: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 +msgid "Journal" +msgstr "日誌" + +#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:231 +msgid "Public journal" +msgstr "公開日誌" + +#: kallithea/templates/base/base.html:236 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:237 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:241 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:243 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:244 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:249 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:272 +#: kallithea/templates/base/base.html:273 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:4 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:8 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:292 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:299 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:322 msgid "Forgot password ?" msgstr "忘記密碼?" -#: kallithea/templates/base/base.html:286 +#: kallithea/templates/base/base.html:347 msgid "Log Out" msgstr "登出" -#: kallithea/templates/base/base.html:311 -msgid "Show recent activity" -msgstr "" - -#: kallithea/templates/base/base.html:312 -#: kallithea/templates/journal/journal.html:4 -msgid "Journal" -msgstr "日誌" - -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 -msgid "Public journal" -msgstr "公開日誌" - -#: kallithea/templates/base/base.html:323 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:324 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:327 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:328 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:330 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:331 -msgid "My private gists" -msgstr "" - -#: kallithea/templates/base/base.html:336 -msgid "Search in repositories" -msgstr "" - -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:527 +#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:536 +#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" @@ -4377,85 +4467,86 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:45 -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:46 +#: kallithea/templates/base/root.html:22 +#, fuzzy +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:23 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "開始追蹤這個版本庫" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "群組" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:26 msgid "members" msgstr "成員" -#: kallithea/templates/base/root.html:50 -#: kallithea/templates/pullrequests/pullrequest.html:202 +#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:54 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "Open new pull request for selected changesets" -msgstr "" - -#: kallithea/templates/base/root.html:56 -msgid "Show selected changesets __S -> __E" -msgstr "" - -#: kallithea/templates/base/root.html:57 -msgid "Show selected changeset __S" -msgstr "" - -#: kallithea/templates/base/root.html:58 -msgid "Selection link" -msgstr "" - -#: kallithea/templates/base/root.html:59 +#: kallithea/templates/base/root.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:30 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Open New Pull Request for Selected Changesets" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Show Selected Changesets __S → __E" +msgstr "" + +#: kallithea/templates/base/root.html:34 +msgid "Show Selected Changeset __S" +msgstr "" + +#: kallithea/templates/base/root.html:35 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:36 #: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" -msgstr "" - -#: kallithea/templates/base/root.html:60 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:61 +#, fuzzy +msgid "Collapse Diff" +msgstr "檔案差異" + +#: kallithea/templates/base/root.html:37 +#, fuzzy +msgid "Expand Diff" +msgstr "檔案差異" + +#: kallithea/templates/base/root.html:38 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:62 -msgid "confirm to revoke permission for {0}: {1} ?" -msgstr "" - -#: kallithea/templates/base/root.html:66 -msgid "specify changeset" +#: kallithea/templates/base/root.html:39 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:43 +msgid "Specify changeset" msgstr "" #: kallithea/templates/bookmarks/bookmarks.html:5 @@ -4463,26 +4554,29 @@ msgid "%s Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:29 +#: kallithea/templates/bookmarks/bookmarks.html:26 msgid "Compare Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks.html:53 #: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches.html:53 #: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/tags/tags.html:53 #: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks.html:54 #: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches.html:54 #: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 #: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "修訂" @@ -4492,7 +4586,7 @@ msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4507,299 +4601,333 @@ msgid_plural "showing %d out of %d revisions" msgstr[0] "" -#: kallithea/templates/changelog/changelog.html:43 +#: kallithea/templates/changelog/changelog.html:42 +msgid "Show" +msgstr "顯示" + +#: kallithea/templates/changelog/changelog.html:52 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:47 +#: kallithea/templates/changelog/changelog.html:55 +#, fuzzy +msgid "Go to tip of repository" +msgstr "Git 版本庫" + +#: kallithea/templates/changelog/changelog.html:60 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:49 -#, python-format -msgid "Compare fork with Parent(%s)" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:56 -msgid "Show" -msgstr "顯示" - -#: kallithea/templates/changelog/changelog.html:82 -#: kallithea/templates/changelog/changelog_summary_data.html:19 +#: kallithea/templates/changelog/changelog.html:62 +#, python-format +msgid "Compare fork with parent repo (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 #, python-format msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" msgstr "" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/compare/compare_cs.html:18 +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:105 -#: kallithea/templates/compare/compare_cs.html:36 +#: kallithea/templates/changelog/changelog.html:115 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:114 -msgid "Changeset has comments" -msgstr "" - #: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/changelog/changelog_summary_data.html:50 -#: kallithea/templates/changeset/changeset.html:93 -#: kallithea/templates/changeset/changeset_range.html:93 +#: kallithea/templates/compare/compare_cs.html:30 +msgid "Changeset has comments" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:134 +#: kallithea/templates/changelog/changelog_summary_data.html:54 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:130 -#: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/changeset_range.html:99 +#: kallithea/templates/changelog/changelog.html:140 +#: kallithea/templates/changelog/changelog_summary_data.html:60 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:105 -#: kallithea/templates/changeset/changeset_range.html:103 +#: kallithea/templates/changelog/changelog.html:145 +#: kallithea/templates/changelog/changelog_summary_data.html:65 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:299 +#: kallithea/templates/changelog/changelog.html:290 msgid "There are no changes yet" msgstr "尚未有任何變更" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:76 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:80 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:80 #: kallithea/templates/changeset/changeset.html:81 #: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:53 -msgid "Commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:7 -msgid "Age" +#: kallithea/templates/changelog/changelog_summary_data.html:8 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 +msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/changelog/changelog_summary_data.html:11 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:91 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:89 +#: kallithea/templates/changelog/changelog_summary_data.html:94 +#: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:95 +#: kallithea/templates/changelog/changelog_summary_data.html:100 msgid "Push new repo" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:103 +#: kallithea/templates/changelog/changelog_summary_data.html:108 msgid "Existing repository?" msgstr "" -#: kallithea/templates/changeset/changeset.html:6 +#: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:37 +#: kallithea/templates/changeset/changeset.html:36 msgid "parent rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/changeset.html:42 msgid "child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:51 -#: kallithea/templates/changeset/changeset_file_comment.html:41 -#: kallithea/templates/changeset/changeset_range.html:51 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:43 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/changeset.html:54 #: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:58 +#: kallithea/templates/changeset/changeset.html:57 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/changeset.html:60 #: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" - -#: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:111 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "" - -#: kallithea/templates/changeset/changeset.html:88 -#: kallithea/templates/changeset/changeset_range.html:89 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "merge" msgstr "合併" -#: kallithea/templates/changeset/changeset.html:124 -#: kallithea/templates/compare/compare_diff.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:160 +#: kallithea/templates/changeset/changeset.html:123 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:129 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:137 +#: kallithea/templates/compare/compare_diff.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:162 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Showing a huge diff might take some time and resources" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:139 -#: kallithea/templates/changeset/changeset.html:151 -#: kallithea/templates/compare/compare_diff.html:75 -#: kallithea/templates/compare/compare_diff.html:85 -#: kallithea/templates/pullrequests/pullrequest_show.html:178 -#: kallithea/templates/pullrequests/pullrequest_show.html:202 -msgid "Show full diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:214 -#: kallithea/templates/changeset/changeset.html:251 +#: kallithea/templates/changeset/changeset.html:153 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:328 +#: kallithea/templates/pullrequests/pullrequest_show.html:351 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:224 +#: kallithea/templates/changeset/changeset.html:261 msgid "no revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:23 -#, python-format -msgid "Vote on pull request #%s" +#: kallithea/templates/changeset/changeset_file_comment.html:24 +msgid "Status change from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:25 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:30 -msgid "Status change on changeset" +#: kallithea/templates/changeset/changeset_file_comment.html:28 +#, fuzzy +msgid "No title" +msgstr "沒有檔案" + +#: kallithea/templates/changeset/changeset_file_comment.html:27 +msgid "Comment from pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:32 +msgid "Status change on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:34 msgid "Comment on changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:63 -msgid "Submitting..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:66 -msgid "Commenting on line {1}." +#: kallithea/templates/changeset/changeset_file_comment.html:50 +#, fuzzy +msgid "Delete comment?" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/templates/changeset/changeset_file_comment.html:153 +msgid "Commenting on line {1}." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:68 +#: kallithea/templates/changeset/changeset_file_comment.html:163 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 -#: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "Use @username inside this text to send notification to this Kallithea user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:166 -msgid "Preview" +#: kallithea/templates/changeset/changeset_file_comment.html:70 +msgid "Use @username inside this text to notify another user" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:189 +#: kallithea/templates/changeset/changeset_file_comment.html:199 msgid "Comment preview" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:85 +msgid "Submitting ..." +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:88 -#: kallithea/templates/changeset/changeset_file_comment.html:196 -#: kallithea/templates/email_templates/changeset_comment.html:11 -#: kallithea/templates/email_templates/pull_request_comment.html:16 +#: kallithea/templates/changeset/changeset_file_comment.html:205 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:206 +msgid "Preview" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:96 +#: kallithea/templates/changeset/changeset_file_comment.html:98 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:100 +#: kallithea/templates/changeset/changeset_file_comment.html:102 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:159 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:115 +#, fuzzy, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:116 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:165 +msgid "Use @username inside this text to send notification to another local user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:172 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:161 -msgid "Change changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:179 -msgid "Close (when approved or rejected)" +#: kallithea/templates/changeset/changeset_file_comment.html:174 +#, fuzzy +msgid "Set changeset status" +msgstr "尚未有任何變更" + +#: kallithea/templates/changeset/changeset_file_comment.html:178 +#, fuzzy +msgid "No change" +msgstr "沒有修改" + +#: kallithea/templates/changeset/changeset_file_comment.html:191 +msgid "Close" msgstr "" #: kallithea/templates/changeset/changeset_range.html:5 @@ -4807,18 +4935,18 @@ msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:59 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "" #: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:68 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:99 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" @@ -4826,13 +4954,15 @@ msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:62 -msgid "Show file at latest version in this repo" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:64 -msgid "Show file at initial version in this repo" -msgstr "" +#: kallithea/templates/changeset/diff_block.html:87 +#, fuzzy +msgid "Deleted" +msgstr "刪除" + +#: kallithea/templates/changeset/diff_block.html:90 +#, fuzzy +msgid "Renamed" +msgstr "讀" #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -4842,68 +4972,97 @@ msgid "Ancestor" msgstr "" +#: kallithea/templates/compare/compare_cs.html:61 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:299 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:75 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:83 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:84 +#, fuzzy, python-format +msgid "%s changesets" +msgstr "變更" + +#: kallithea/templates/compare/compare_cs.html:85 +#, fuzzy +msgid "behind" +msgstr "重新索引" + #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 #, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:16 -msgid "Compare revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:36 +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:35 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:38 -msgid "Compare Revisions" -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:45 -msgid "Compare revisions, branches, bookmarks or tags." -msgstr "" - -#: kallithea/templates/compare/compare_diff.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:153 +#: kallithea/templates/compare/compare_diff.html:42 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:47 +#: kallithea/templates/pullrequests/pullrequest_show.html:294 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" #: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:168 +#: kallithea/templates/pullrequests/pullrequest_show.html:315 msgid "No files" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/compare/compare_diff.html:78 +#: kallithea/templates/compare/compare_diff.html:89 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:67 msgid "Mercurial repository" msgstr "Mercurial 版本庫" -#: kallithea/templates/data_table/_dt_elements.html:65 +#: kallithea/templates/data_table/_dt_elements.html:69 msgid "Git repository" msgstr "Git 版本庫" -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Public repository" msgstr "公開的版本庫" -#: kallithea/templates/data_table/_dt_elements.html:82 +#: kallithea/templates/data_table/_dt_elements.html:86 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:96 +#: kallithea/templates/data_table/_dt_elements.html:100 msgid "No changesets yet" msgstr "尚未有任何變更" -#: kallithea/templates/data_table/_dt_elements.html:103 -#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:109 #, python-format msgid "Subscribe to %s rss feed" msgstr "訂閱 %s rss" -#: kallithea/templates/data_table/_dt_elements.html:111 -#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:117 #, python-format msgid "Subscribe to %s atom feed" msgstr "訂閱 %s atom" @@ -4912,17 +5071,22 @@ msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:6 -#, python-format -msgid "%s commented on a %s changeset." -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" -#: kallithea/templates/email_templates/main.html:8 -msgid "This is a notification from Kallithea." +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/templates/email_templates/password_reset.html:4 @@ -4930,11 +5094,11 @@ msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:5 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We received a request to create a new password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:7 msgid "You can generate it by clicking following URL" msgstr "" @@ -4942,67 +5106,50 @@ msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:6 -#, python-format -msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:28 -msgid "Title" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:6 -#, python-format -msgid "%s commented on pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:10 -msgid "Pull request was closed with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:12 -msgid "Pull request changed status" +#: kallithea/templates/email_templates/pull_request.html:5 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:7 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" msgstr "" #: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:47 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "" - #: kallithea/templates/files/diff_2way.html:15 #, python-format msgid "%s File side-by-side diff" msgstr "" -#: kallithea/templates/files/diff_2way.html:22 -#: kallithea/templates/files/file_diff.html:11 +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 msgid "File diff" msgstr "檔案差異" -#: kallithea/templates/files/diff_2way.html:58 -msgid "ignore whitespace" -msgstr "" - -#: kallithea/templates/files/diff_2way.html:59 -msgid "turn on edit mode" -msgstr "" - #: kallithea/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:84 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "" @@ -5012,85 +5159,84 @@ msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:25 -msgid "Add new file" -msgstr "" - -#: kallithea/templates/files/files_add.html:45 -#: kallithea/templates/files/files_edit.html:43 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "位置" -#: kallithea/templates/files/files_add.html:47 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:49 -#: kallithea/templates/files/files_add.html:53 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" +#: kallithea/templates/files/files_add.html:48 +msgid "Create New File" +msgstr "" + #: kallithea/templates/files/files_add.html:53 -msgid "Create New File" -msgstr "" - -#: kallithea/templates/files/files_add.html:58 msgid "New file mode" msgstr "" -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:57 -#: kallithea/templates/files/files_edit.html:72 -msgid "Commit changes" +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 +#, fuzzy +msgid "Commit Changes" msgstr "遞交修改" -#: kallithea/templates/files/files_browser.html:13 +#: kallithea/templates/files/files_browser.html:32 msgid "revision" msgstr "" -#: kallithea/templates/files/files_browser.html:14 +#: kallithea/templates/files/files_browser.html:33 msgid "Previous revision" msgstr "" -#: kallithea/templates/files/files_browser.html:16 +#: kallithea/templates/files/files_browser.html:35 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:22 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:25 -msgid "Search File List" -msgstr "" - -#: kallithea/templates/files/files_browser.html:29 -msgid "Loading file list..." -msgstr "載入檔案列表..." - -#: kallithea/templates/files/files_browser.html:42 -msgid "Size" -msgstr "大小" - -#: kallithea/templates/files/files_browser.html:43 -msgid "Mimetype" -msgstr "" - #: kallithea/templates/files/files_browser.html:44 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:48 +msgid "Loading file list..." +msgstr "載入檔案列表..." + +#: kallithea/templates/files/files_browser.html:61 +msgid "Size" +msgstr "大小" + +#: kallithea/templates/files/files_browser.html:62 +msgid "Mimetype" +msgstr "" + +#: kallithea/templates/files/files_browser.html:63 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:45 -msgid "Last modified" +#: kallithea/templates/files/files_browser.html:64 +#, fuzzy +msgid "Last Modified" msgstr "最後修改" -#: kallithea/templates/files/files_browser.html:46 -msgid "Last committer" +#: kallithea/templates/files/files_browser.html:65 +#, fuzzy +msgid "Last Committer" msgstr "最後的遞交者" #: kallithea/templates/files/files_delete.html:4 @@ -5098,8 +5244,8 @@ msgid "%s Files Delete" msgstr "" -#: kallithea/templates/files/files_delete.html:25 -#: kallithea/templates/files/files_delete.html:45 +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -5108,32 +5254,28 @@ msgid "%s File Edit" msgstr "" -#: kallithea/templates/files/files_edit.html:25 +#: kallithea/templates/files/files_edit.html:21 msgid "Edit file" msgstr "" +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:32 -msgid "Show Annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:55 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" +msgid "Source" msgstr "" #: kallithea/templates/files/files_edit.html:58 -msgid "Source" -msgstr "" - -#: kallithea/templates/files/files_edit.html:63 msgid "Editing file" msgstr "" -#: kallithea/templates/files/files_edit.html:68 -msgid "Commit Message" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5177,12 +5319,12 @@ msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:61 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "二進位檔 (%s)" -#: kallithea/templates/files/files_source.html:71 +#: kallithea/templates/files/files_source.html:73 msgid "File is too big to display" msgstr "顯示的檔案太大" @@ -5203,9 +5345,9 @@ msgid "%s Followers" msgstr "" -#: kallithea/templates/followers/followers.html:12 -#: kallithea/templates/summary/summary.html:149 -#: kallithea/templates/summary/summary.html:150 +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:146 msgid "Followers" msgstr "追蹤者" @@ -5218,31 +5360,35 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:30 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "分支名稱" -#: kallithea/templates/forks/fork.html:71 +#: kallithea/templates/forks/fork.html:62 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "私有" -#: kallithea/templates/forks/fork.html:80 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:84 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:90 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:94 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:99 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -5251,9 +5397,9 @@ msgid "%s Forks" msgstr "" -#: kallithea/templates/forks/forks.html:12 -#: kallithea/templates/summary/summary.html:155 -#: kallithea/templates/summary/summary.html:156 +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:151 +#: kallithea/templates/summary/summary.html:152 msgid "Forks" msgstr "" @@ -5261,163 +5407,285 @@ msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:42 +#: kallithea/templates/forks/forks_data.html:43 msgid "There are no forks yet" msgstr "尚未有任何 fork" -#: kallithea/templates/journal/journal.html:24 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:25 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:57 -msgid "My repos" -msgstr "" - -#: kallithea/templates/journal/journal_data.html:55 +#: kallithea/templates/journal/journal.html:56 +#, fuzzy +msgid "My Repos" +msgstr "空的版本庫" + +#: kallithea/templates/journal/journal_data.html:61 msgid "No entries yet" msgstr "" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:24 +#: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "開放日誌" -#: kallithea/templates/journal/public_journal.html:16 +#: kallithea/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:17 +#: kallithea/templates/journal/public_journal.html:14 msgid "RSS public journal feed" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -msgid "New pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:44 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:34 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:50 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:57 -#: kallithea/templates/pullrequests/pullrequest_show.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:82 -msgid "Send Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:91 -#: kallithea/templates/pullrequests/pullrequest_show.html:104 -msgid "Pull request reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:100 -#: kallithea/templates/pullrequests/pullrequest_show.html:116 -msgid "owner" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:114 -msgid "Add reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:128 -msgid "Detailed compare view" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:210 +msgid "Pull Request Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:239 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:27 +#, python-format +msgid "Latest vote: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:29 +msgid "Nobody voted" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:34 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:36 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:45 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:46 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:54 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:36 -msgid "Review status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request #%s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#, fuzzy +msgid "Summarize the changes" +msgstr "遞交修改" + +#: kallithea/templates/pullrequests/pullrequest_show.html:74 +msgid "Reviewer voting result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:56 +#: kallithea/templates/pullrequests/pullrequest_show.html:94 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:98 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:77 -#: kallithea/templates/pullrequests/pullrequest_show.html:79 +#: kallithea/templates/pullrequests/pullrequest_show.html:102 +#, fuzzy +msgid "There are no reviewers" +msgstr "沒有任何分支" + +#: kallithea/templates/pullrequests/pullrequest_show.html:108 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#, fuzzy +msgid "on" +msgstr "無" + +#: kallithea/templates/pullrequests/pullrequest_show.html:121 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:132 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#: kallithea/templates/pullrequests/pullrequest_show.html:155 +msgid "Created by" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +msgid "Update" +msgstr "時間" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "owner" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: kallithea/templates/pullrequests/pullrequest_show.html:227 +#, fuzzy +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +#, fuzzy +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:250 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:273 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:149 -msgid "Compare view" -msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:274 +msgid "Save as New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:275 +#, fuzzy +msgid "Cancel Changes" +msgstr "沒有修改" + +#: kallithea/templates/pullrequests/pullrequest_show.html:285 +#, fuzzy +msgid "Pull Request Content" +msgstr "文件內容" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 -#, python-format -msgid "Pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 -#, python-format -msgid "Pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 -#, python-format -msgid "Show pull requests to %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 -#, python-format -msgid "Show pull requests from %s" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 -msgid "Hide closed pull requests" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 -msgid "Show closed pull requests too" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:9 +#, python-format +msgid "Pull Requests from %s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:35 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:47 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:26 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:3 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my_data.html:6 +msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 @@ -5426,27 +5694,28 @@ msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:19 -msgid "Search in all repositories" -msgstr "" - -#: kallithea/templates/search/search.html:53 +#: kallithea/templates/search/search.html:16 +#, fuzzy +msgid "Search in All Repositories" +msgstr "Mercurial 版本庫" + +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "搜尋關鍵字" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "搜尋範圍" -#: kallithea/templates/search/search.html:68 +#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "文件內容" -#: kallithea/templates/search/search.html:69 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:70 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "檔案名稱" @@ -5461,67 +5730,67 @@ msgid "%s Statistics" msgstr "" -#: kallithea/templates/summary/statistics.html:19 -#: kallithea/templates/summary/summary.html:42 +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" -#: kallithea/templates/summary/statistics.html:20 -#: kallithea/templates/summary/summary.html:43 +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:103 +#: kallithea/templates/summary/summary.html:119 +msgid "Enable" +msgstr "" + #: kallithea/templates/summary/statistics.html:39 -#: kallithea/templates/summary/summary.html:107 -#: kallithea/templates/summary/summary.html:123 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:42 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:91 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/statistics.html:88 +#: kallithea/templates/summary/summary.html:352 msgid "files" msgstr "檔案" -#: kallithea/templates/summary/statistics.html:115 -#: kallithea/templates/summary/summary.html:378 +#: kallithea/templates/summary/statistics.html:112 +#: kallithea/templates/summary/summary.html:376 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:389 msgid "commits" msgstr "遞交" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:390 msgid "files added" msgstr "多個檔案新增" +#: kallithea/templates/summary/statistics.html:391 +msgid "files changed" +msgstr "多個檔案修改" + +#: kallithea/templates/summary/statistics.html:392 +msgid "files removed" +msgstr "移除多個檔案" + #: kallithea/templates/summary/statistics.html:394 -msgid "files changed" -msgstr "多個檔案修改" +msgid "commit" +msgstr "遞交" #: kallithea/templates/summary/statistics.html:395 -msgid "files removed" -msgstr "移除多個檔案" +msgid "file added" +msgstr "檔案新增" + +#: kallithea/templates/summary/statistics.html:396 +msgid "file changed" +msgstr "檔案修改" #: kallithea/templates/summary/statistics.html:397 -msgid "commit" -msgstr "遞交" - -#: kallithea/templates/summary/statistics.html:398 -msgid "file added" -msgstr "檔案新增" - -#: kallithea/templates/summary/statistics.html:399 -msgid "file changed" -msgstr "檔案修改" - -#: kallithea/templates/summary/statistics.html:400 msgid "file removed" msgstr "移除檔案" @@ -5530,78 +5799,80 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:16 +#: kallithea/templates/summary/summary.html:13 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:18 +#: kallithea/templates/summary/summary.html:15 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:76 -msgid "Clone url" -msgstr "複製連結" - -#: kallithea/templates/summary/summary.html:81 +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:77 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:82 +#: kallithea/templates/summary/summary.html:78 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:95 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:111 +msgid "Download" +msgstr "下載" + #: kallithea/templates/summary/summary.html:115 -msgid "Download" -msgstr "下載" - -#: kallithea/templates/summary/summary.html:119 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: kallithea/templates/summary/summary.html:121 +#: kallithea/templates/summary/summary.html:117 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: kallithea/templates/summary/summary.html:127 +#: kallithea/templates/summary/summary.html:123 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:132 +#: kallithea/templates/summary/summary.html:128 msgid "with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:159 msgid "Repository Size" msgstr "" -#: kallithea/templates/summary/summary.html:170 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:166 +#: kallithea/templates/summary/summary.html:168 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:193 -msgid "Latest changes" -msgstr "" - -#: kallithea/templates/summary/summary.html:195 -msgid "Quick start" -msgstr "" - -#: kallithea/templates/summary/summary.html:209 +#: kallithea/templates/summary/summary.html:189 +#, fuzzy +msgid "Latest Changes" +msgstr "多個檔案修改" + +#: kallithea/templates/summary/summary.html:191 +#, fuzzy +msgid "Quick Start" +msgstr "快速過濾..." + +#: kallithea/templates/summary/summary.html:205 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:299 +#: kallithea/templates/summary/summary.html:296 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" @@ -5611,7 +5882,7 @@ msgid "%s Tags" msgstr "" -#: kallithea/templates/tags/tags.html:29 -msgid "Compare tags" -msgstr "" - +#: kallithea/templates/tags/tags.html:26 +msgid "Compare Tags" +msgstr "" +