Mercurial > kallithea
diff kallithea/i18n/cs/LC_MESSAGES/kallithea.po @ 8215:928bc1d8b279 default-i18n
Merge from default
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 06 Feb 2020 01:19:23 +0100 |
parents | a62acba8124e |
children | 68d4aae74194 |
line wrap: on
line diff
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Sun Jan 05 01:19:05 2020 +0100 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Thu Feb 06 01:19:23 2020 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-11-14 23:33+0100\n" +"POT-Creation-Date: 2020-02-06 01:19+0100\n" "PO-Revision-Date: 2015-11-12 08:51+0000\n" "Last-Translator: Michal Čihař <michal@cihar.com>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/kallithea/" @@ -18,14 +18,14 @@ "X-Generator: Weblate 2.5-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/controllers/changelog.py:137 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,37 +34,37 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(zavřeno)" -#: kallithea/controllers/changeset.py:81 +#: kallithea/controllers/changeset.py:82 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:88 -#: kallithea/controllers/changeset.py:95 +#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:96 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:161 +#: kallithea/controllers/changeset.py:162 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:201 +#: kallithea/controllers/changeset.py:202 #, fuzzy msgid "No permission to change status" msgstr "Změny" -#: kallithea/controllers/changeset.py:212 +#: kallithea/controllers/changeset.py:213 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 -#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 +#: kallithea/controllers/changeset.py:320 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:697 msgid "Such revision does not exist for this repository" msgstr "Taková revize neexistuje" @@ -78,62 +78,62 @@ msgid "Cannot compare repositories of different types" msgstr "" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:247 msgid "Cannot show empty diff" msgstr "" -#: kallithea/controllers/compare.py:248 +#: kallithea/controllers/compare.py:249 msgid "No ancestor found for merge diff" msgstr "" -#: kallithea/controllers/compare.py:252 +#: kallithea/controllers/compare.py:253 msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:268 +#: kallithea/controllers/compare.py:269 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "Neznámá revize %s" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:85 +#: kallithea/controllers/error.py:84 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:88 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:90 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Nemáte oprávnění k zobrazení této stránky" -#: kallithea/controllers/error.py:92 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:94 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:59 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/feed.py:88 -#: kallithea/templates/changeset/changeset.html:154 -#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/controllers/feed.py:84 +#: kallithea/templates/changeset/changeset.html:152 +#: kallithea/templates/changeset/changeset.html:171 #: kallithea/templates/compare/compare_diff.html:81 #: kallithea/templates/compare/compare_diff.html:95 #: kallithea/templates/pullrequests/pullrequest_show.html:309 @@ -141,12 +141,12 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:140 +#: kallithea/controllers/feed.py:107 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:142 +#: kallithea/controllers/feed.py:109 #, python-format msgid "Changes on %s repository" msgstr "Změny na repozitáři %s" @@ -166,90 +166,90 @@ msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:296 +#: kallithea/controllers/files.py:295 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:307 +#: kallithea/controllers/files.py:306 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:331 +#: kallithea/controllers/files.py:330 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:334 kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:467 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:349 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:364 +#: kallithea/controllers/files.py:363 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:380 +#: kallithea/controllers/files.py:378 msgid "No changes" msgstr "Žádné změny" -#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:388 kallithea/controllers/files.py:456 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:407 msgid "Added file via Kallithea" msgstr "Přidaný soubor přes Kallithea" -#: kallithea/controllers/files.py:430 +#: kallithea/controllers/files.py:428 msgid "No content" msgstr "Žádný obsah" -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:432 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:461 +#: kallithea/controllers/files.py:459 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:491 msgid "Downloads disabled" msgstr "Stahování vypnuto" -#: kallithea/controllers/files.py:504 +#: kallithea/controllers/files.py:502 #, python-format msgid "Unknown revision %s" msgstr "Neznámá revize %s" -#: kallithea/controllers/files.py:506 +#: kallithea/controllers/files.py:504 msgid "Empty repository" msgstr "Prázdný repozitář" -#: kallithea/controllers/files.py:508 +#: kallithea/controllers/files.py:506 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:729 +#: kallithea/controllers/files.py:726 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Změny" -#: kallithea/controllers/files.py:730 -#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 +#: kallithea/controllers/files.py:727 +#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 msgid "Branches" msgstr "Větve" -#: kallithea/controllers/files.py:731 -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 +#: kallithea/controllers/files.py:728 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 msgid "Tags" msgstr "Tagy" @@ -258,11 +258,11 @@ msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:79 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:89 +#: kallithea/controllers/home.py:87 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 @@ -274,194 +274,194 @@ msgid "Repositories" msgstr "Repozitáře" -#: kallithea/controllers/home.py:122 +#: kallithea/controllers/home.py:119 #: 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:128 +#: kallithea/controllers/home.py:125 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:134 +#: kallithea/controllers/home.py:131 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:140 +#: kallithea/controllers/home.py:137 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 +#: kallithea/controllers/journal.py:146 kallithea/controllers/journal.py:157 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/controllers/journal.py:150 kallithea/controllers/journal.py:161 #: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "Špatná captcha" -#: kallithea/controllers/login.py:146 +#: kallithea/controllers/login.py:145 #, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:239 +#: kallithea/controllers/login.py:236 msgid "Invalid password reset token" msgstr "" #: kallithea/controllers/admin/my_account.py:157 -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:241 msgid "Successfully updated password" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/pullrequests.py:68 +#: kallithea/controllers/pullrequests.py:67 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:131 +#: kallithea/controllers/pullrequests.py:123 #, python-format msgid "%s (closed)" msgstr "%s (zavřené)" -#: kallithea/controllers/pullrequests.py:158 +#: kallithea/controllers/pullrequests.py:150 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:179 +#: kallithea/controllers/pullrequests.py:171 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:180 +#: kallithea/controllers/pullrequests.py:172 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 +#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:318 +#: kallithea/controllers/pullrequests.py:315 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:345 -#: kallithea/controllers/pullrequests.py:368 +#: kallithea/controllers/pullrequests.py:342 +#: kallithea/controllers/pullrequests.py:365 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:350 +#: kallithea/controllers/pullrequests.py:347 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:373 +#: kallithea/controllers/pullrequests.py:370 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:401 +#: kallithea/controllers/pullrequests.py:398 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:405 +#: kallithea/controllers/pullrequests.py:402 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:421 -#: kallithea/model/pull_request.py:232 +#: kallithea/controllers/pullrequests.py:418 +#: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:430 +#: kallithea/controllers/pullrequests.py:427 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:443 +#: kallithea/controllers/pullrequests.py:440 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:479 +#: kallithea/controllers/pullrequests.py:476 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:506 +#: kallithea/controllers/pullrequests.py:504 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:520 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:546 +#: kallithea/controllers/pullrequests.py:539 #, python-format msgid "The following additional changes are available on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:548 -#: kallithea/controllers/pullrequests.py:552 +#: kallithea/controllers/pullrequests.py:541 +#: kallithea/controllers/pullrequests.py:545 msgid "No additional changesets found for iterating on this pull request." msgstr "" +#: kallithea/controllers/pullrequests.py:553 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + #: kallithea/controllers/pullrequests.py:560 -#, python-format -msgid "Note: Branch %s has another head: %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:567 msgid "Git pull requests don't support iterating yet." msgstr "" -#: kallithea/controllers/pullrequests.py:569 +#: kallithea/controllers/pullrequests.py:562 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:593 +#: kallithea/controllers/pullrequests.py:586 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" +#: kallithea/controllers/search.py:132 +msgid "Invalid search query. Try quoting it." +msgstr "" + #: kallithea/controllers/search.py:136 -msgid "Invalid search query. Try quoting it." -msgstr "" - -#: kallithea/controllers/search.py:140 msgid "The server has no search index." msgstr "" -#: kallithea/controllers/search.py:143 +#: kallithea/controllers/search.py:139 msgid "An error occurred during search operation." msgstr "Došlo k chybě při vyhledávání." -#: kallithea/controllers/summary.py:168 -#: kallithea/templates/summary/summary.html:412 +#: kallithea/controllers/summary.py:169 +#: kallithea/templates/summary/summary.html:410 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:171 +#: kallithea/controllers/summary.py:172 #: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "" @@ -474,80 +474,80 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:75 +#: kallithea/controllers/admin/defaults.py:74 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:90 +#: kallithea/controllers/admin/defaults.py:89 msgid "Error occurred during update of defaults" msgstr "" #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:232 -#: kallithea/controllers/admin/users.py:248 +#: kallithea/controllers/admin/users.py:246 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:233 -#: kallithea/controllers/admin/users.py:249 +#: kallithea/controllers/admin/users.py:247 msgid "5 minutes" msgstr "5 minut" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:234 -#: kallithea/controllers/admin/users.py:250 +#: kallithea/controllers/admin/users.py:248 msgid "1 hour" msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:251 +#: kallithea/controllers/admin/users.py:249 msgid "1 day" msgstr "1 den" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:236 -#: kallithea/controllers/admin/users.py:252 +#: kallithea/controllers/admin/users.py:250 msgid "1 month" msgstr "1 měsíc" #: kallithea/controllers/admin/gists.py:67 #: kallithea/controllers/admin/my_account.py:238 -#: kallithea/controllers/admin/users.py:254 +#: kallithea/controllers/admin/users.py:252 #: kallithea/templates/admin/my_account/my_account_api_keys.html:65 #: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:142 +#: kallithea/controllers/admin/gists.py:148 msgid "Error occurred during gist creation" msgstr "Došlo k chybě při vytváření gist" -#: kallithea/controllers/admin/gists.py:158 +#: kallithea/controllers/admin/gists.py:164 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:198 +#: kallithea/controllers/admin/gists.py:207 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:228 +#: kallithea/controllers/admin/gists.py:237 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:242 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:236 +#: kallithea/controllers/admin/gists.py:245 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 -#: kallithea/model/user.py:232 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:209 +#: kallithea/model/user.py:230 msgid "You can't edit this user since it's crucial for entire application" msgstr "" @@ -556,7 +556,7 @@ msgstr "" #: kallithea/controllers/admin/my_account.py:134 -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:179 #, python-format msgid "Error occurred during update of user %s" msgstr "" @@ -566,44 +566,44 @@ msgstr "Došlo k chybě při aktualizaci hesla uživatele" #: kallithea/controllers/admin/my_account.py:209 -#: kallithea/controllers/admin/users.py:367 +#: kallithea/controllers/admin/users.py:365 #, python-format msgid "Added email %s to user" msgstr "" #: kallithea/controllers/admin/my_account.py:215 -#: kallithea/controllers/admin/users.py:373 +#: kallithea/controllers/admin/users.py:371 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:224 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/users.py:381 msgid "Removed email from user" msgstr "" #: kallithea/controllers/admin/my_account.py:248 -#: kallithea/controllers/admin/users.py:271 +#: kallithea/controllers/admin/users.py:269 msgid "API key successfully created" msgstr "" #: kallithea/controllers/admin/my_account.py:257 -#: kallithea/controllers/admin/users.py:281 +#: kallithea/controllers/admin/users.py:279 msgid "API key successfully reset" msgstr "" #: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully deleted" msgstr "" #: kallithea/controllers/admin/my_account.py:281 -#: kallithea/controllers/admin/users.py:456 +#: kallithea/controllers/admin/users.py:454 #, python-format msgid "SSH key %s successfully added" msgstr "" #: kallithea/controllers/admin/my_account.py:293 -#: kallithea/controllers/admin/users.py:470 +#: kallithea/controllers/admin/users.py:468 #, fuzzy msgid "SSH key successfully deleted" msgstr "Úspěšně aktualizované heslo" @@ -680,11 +680,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1670 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1671 msgid "Automatic activation of external account" msgstr "" @@ -706,59 +706,59 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:172 +#: kallithea/controllers/admin/repo_groups.py:167 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:177 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:221 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: kallithea/controllers/admin/repo_groups.py:237 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:247 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:254 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:260 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 -#: kallithea/controllers/admin/user_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:349 +#: kallithea/controllers/admin/repo_groups.py:379 +#: kallithea/controllers/admin/user_groups.py:292 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:364 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:396 #: kallithea/controllers/admin/repos.py:358 -#: kallithea/controllers/admin/user_groups.py:306 +#: kallithea/controllers/admin/user_groups.py:304 msgid "An error occurred during revoking of permission" msgstr "" @@ -885,7 +885,7 @@ msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:237 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:238 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -951,96 +951,96 @@ msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:138 +#: kallithea/controllers/admin/user_groups.py:136 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:151 +#: kallithea/controllers/admin/user_groups.py:149 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:179 +#: kallithea/controllers/admin/user_groups.py:177 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:212 +#: kallithea/controllers/admin/user_groups.py:210 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:217 +#: kallithea/controllers/admin/user_groups.py:215 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:273 +#: kallithea/controllers/admin/user_groups.py:271 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:279 +#: kallithea/controllers/admin/user_groups.py:277 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:388 -#: kallithea/controllers/admin/users.py:338 +#: kallithea/controllers/admin/user_groups.py:386 +#: kallithea/controllers/admin/users.py:336 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:392 -#: kallithea/controllers/admin/users.py:342 +#: kallithea/controllers/admin/user_groups.py:390 +#: kallithea/controllers/admin/users.py:340 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:123 +#: kallithea/controllers/admin/users.py:121 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:138 +#: kallithea/controllers/admin/users.py:136 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:162 +#: kallithea/controllers/admin/users.py:160 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:190 +#: kallithea/controllers/admin/users.py:188 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:195 +#: kallithea/controllers/admin/users.py:193 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:203 +#: kallithea/controllers/admin/users.py:201 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:409 +#: kallithea/controllers/admin/users.py:407 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/users.py:413 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:427 +#: kallithea/controllers/admin/users.py:425 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:684 +#: kallithea/lib/auth.py:668 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:712 +#: kallithea/lib/auth.py:696 msgid "You need to be signed in to view this page" msgstr "" @@ -1071,171 +1071,171 @@ "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:224 +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:653 +#: kallithea/lib/helpers.py:646 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:655 +#: kallithea/lib/helpers.py:648 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:666 +#: kallithea/lib/helpers.py:659 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "Změny" -#: kallithea/lib/helpers.py:715 +#: kallithea/lib/helpers.py:708 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:721 +#: kallithea/lib/helpers.py:714 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:740 +#: kallithea/lib/helpers.py:733 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:741 +#: kallithea/lib/helpers.py:734 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:735 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:759 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:780 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:790 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:799 kallithea/lib/helpers.py:811 +#: kallithea/lib/helpers.py:792 kallithea/lib/helpers.py:804 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:801 +#: kallithea/lib/helpers.py:794 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:803 kallithea/lib/helpers.py:813 +#: kallithea/lib/helpers.py:796 kallithea/lib/helpers.py:806 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:805 kallithea/lib/helpers.py:815 +#: kallithea/lib/helpers.py:798 kallithea/lib/helpers.py:808 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:807 +#: kallithea/lib/helpers.py:800 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:809 +#: kallithea/lib/helpers.py:802 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:817 +#: kallithea/lib/helpers.py:810 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:819 +#: kallithea/lib/helpers.py:812 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:821 +#: kallithea/lib/helpers.py:814 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:823 +#: kallithea/lib/helpers.py:816 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:825 +#: kallithea/lib/helpers.py:818 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:827 +#: kallithea/lib/helpers.py:820 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:829 +#: kallithea/lib/helpers.py:822 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:831 +#: kallithea/lib/helpers.py:824 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:833 +#: kallithea/lib/helpers.py:826 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:835 +#: kallithea/lib/helpers.py:828 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:837 +#: kallithea/lib/helpers.py:830 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:839 +#: kallithea/lib/helpers.py:832 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:841 +#: kallithea/lib/helpers.py:834 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:961 +#: kallithea/lib/helpers.py:954 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:965 +#: kallithea/lib/helpers.py:958 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:990 +#: kallithea/lib/helpers.py:983 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:993 +#: kallithea/lib/helpers.py:986 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:996 +#: kallithea/lib/helpers.py:989 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:999 +#: kallithea/lib/helpers.py:992 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1004 +#: kallithea/lib/helpers.py:997 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1297 +#: kallithea/lib/helpers.py:1290 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1243,34 +1243,36 @@ "repositories" msgstr "" -#: kallithea/lib/ssh.py:71 +#: kallithea/lib/ssh.py:75 msgid "SSH key is missing" msgstr "" -#: kallithea/lib/ssh.py:75 -msgid "Incorrect SSH key - it must have both a key type and a base64 part" -msgstr "" - #: kallithea/lib/ssh.py:79 +msgid "" +"Incorrect SSH key - it must have both a key type and a base64 part, like " +"'ssh-rsa ASRNeaZu4FA...xlJp='" +msgstr "" + +#: kallithea/lib/ssh.py:83 msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" msgstr "" -#: kallithea/lib/ssh.py:82 +#: kallithea/lib/ssh.py:86 #, python-format msgid "Incorrect SSH key - unexpected characters in base64 part %r" msgstr "" -#: kallithea/lib/ssh.py:87 +#: kallithea/lib/ssh.py:91 #, python-format msgid "Incorrect SSH key - failed to decode base64 part %r" msgstr "" -#: kallithea/lib/ssh.py:90 +#: kallithea/lib/ssh.py:94 #, python-format msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" msgstr "" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:242 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1278,7 +1280,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:243 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1286,7 +1288,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:244 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1294,7 +1296,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:245 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1302,7 +1304,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:246 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1310,7 +1312,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:339 +#: kallithea/lib/utils2.py:247 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1318,27 +1320,27 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:355 +#: kallithea/lib/utils2.py:263 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:357 +#: kallithea/lib/utils2.py:265 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:359 +#: kallithea/lib/utils2.py:267 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:362 +#: kallithea/lib/utils2.py:270 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:365 +#: kallithea/lib/utils2.py:273 msgid "just now" msgstr "" @@ -1347,135 +1349,135 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 +#: kallithea/model/comment.py:219 kallithea/model/pull_request.py:112 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1496 +#: kallithea/model/db.py:1493 msgid "top level" msgstr "" +#: kallithea/model/db.py:1634 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1636 +msgid "Default user has no access to new repositories" +msgstr "" + #: kallithea/model/db.py:1637 -msgid "Kallithea Administrator" +msgid "Default user has read access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1638 +msgid "Default user has write access to new repositories" msgstr "" #: kallithea/model/db.py:1639 -msgid "Default user has no access to new repositories" -msgstr "" - -#: kallithea/model/db.py:1640 -msgid "Default user has read access to new repositories" +msgid "Default user has admin access to new repositories" msgstr "" #: kallithea/model/db.py:1641 -msgid "Default user has write access to new repositories" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1642 -msgid "Default user has admin access to new repositories" +msgid "Default user has read access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1643 +msgid "Default user has write access to new repository groups" msgstr "" #: kallithea/model/db.py:1644 -msgid "Default user has no access to new repository groups" -msgstr "" - -#: kallithea/model/db.py:1645 -msgid "Default user has read access to new repository groups" +msgid "Default user has admin access to new repository groups" msgstr "" #: kallithea/model/db.py:1646 -msgid "Default user has write access to new repository groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1647 -msgid "Default user has admin access to new repository groups" +msgid "Default user has read access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1648 +msgid "Default user has write access to new user groups" msgstr "" #: kallithea/model/db.py:1649 -msgid "Default user has no access to new user groups" -msgstr "" - -#: kallithea/model/db.py:1650 -msgid "Default user has read access to new user groups" +msgid "Default user has admin access to new user groups" msgstr "" #: kallithea/model/db.py:1651 -msgid "Default user has write access to new user groups" +msgid "Only admins can create repository groups" msgstr "" #: kallithea/model/db.py:1652 -msgid "Default user has admin access to new user groups" +msgid "Non-admins can create repository groups" msgstr "" #: kallithea/model/db.py:1654 -msgid "Only admins can create repository groups" +msgid "Only admins can create user groups" msgstr "" #: kallithea/model/db.py:1655 -msgid "Non-admins can create repository groups" +msgid "Non-admins can create user groups" msgstr "" #: kallithea/model/db.py:1657 -msgid "Only admins can create user groups" +msgid "Only admins can create top level repositories" msgstr "" #: kallithea/model/db.py:1658 -msgid "Non-admins can create user groups" +msgid "Non-admins can create top level repositories" msgstr "" #: kallithea/model/db.py:1660 -msgid "Only admins can create top level repositories" +msgid "" +"Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/model/db.py:1661 -msgid "Non-admins can create top level repositories" +msgid "" +"Repository creation disabled with write permission to a repository group" msgstr "" #: kallithea/model/db.py:1663 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/db.py:1664 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/db.py:1666 #, fuzzy msgid "Only admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1667 +#: kallithea/model/db.py:1664 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1666 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1667 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1668 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2206 -msgid "Not reviewed" -msgstr "" - -#: kallithea/model/db.py:2207 -msgid "Under review" -msgstr "" - #: kallithea/model/db.py:2208 -msgid "Not approved" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:2209 +msgid "Under review" +msgstr "" + +#: kallithea/model/db.py:2210 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2211 msgid "Approved" msgstr "" @@ -1501,146 +1503,146 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:164 +#: kallithea/model/notification.py:163 #, python-format msgid "" "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " "%(branch)s" msgstr "" -#: kallithea/model/notification.py:167 +#: kallithea/model/notification.py:166 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:168 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:169 #, python-format msgid "" -"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " -"%(pr_source_branch)s by %(pr_owner_username)s" -msgstr "" - -#: kallithea/model/notification.py:170 -#, python-format -msgid "" "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " "%(pr_source_branch)s by %(pr_owner_username)s" msgstr "" -#: kallithea/model/notification.py:183 +#: kallithea/model/notification.py:189 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:73 +#: kallithea/model/pull_request.py:72 #, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/pull_request.py:209 +#: kallithea/model/pull_request.py:207 msgid "Cannot create empty pull request" msgstr "" -#: kallithea/model/pull_request.py:217 +#: kallithea/model/pull_request.py:215 #, python-format msgid "" "Cannot create pull request - criss cross merge detected, please merge a " "later %s revision to %s" msgstr "" -#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 +#: kallithea/model/pull_request.py:243 kallithea/model/pull_request.py:378 msgid "You are not authorized to create the pull request" msgstr "" -#: kallithea/model/pull_request.py:339 +#: kallithea/model/pull_request.py:337 msgid "Missing changesets since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:346 +#: kallithea/model/pull_request.py:344 #, python-format msgid "New changesets on %s %s since the previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:353 +#: kallithea/model/pull_request.py:351 msgid "Ancestor didn't change - diff since previous iteration:" msgstr "" -#: kallithea/model/pull_request.py:360 +#: kallithea/model/pull_request.py:358 #, python-format msgid "" "This iteration is based on another %s revision and there is no simple " "diff." msgstr "" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, python-format msgid "No changes found on %s %s since previous iteration." msgstr "" -#: kallithea/model/pull_request.py:388 +#: kallithea/model/pull_request.py:386 #, python-format msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:668 +#: kallithea/model/scm.py:655 msgid "latest tip" msgstr "" -#: kallithea/model/ssh_key.py:56 +#: kallithea/model/ssh_key.py:57 #, python-format msgid "SSH key %r is invalid: %s" msgstr "" -#: kallithea/model/ssh_key.py:68 +#: kallithea/model/ssh_key.py:69 #, python-format msgid "SSH key %s is already used by %s" msgstr "" -#: kallithea/model/ssh_key.py:89 +#: kallithea/model/ssh_key.py:88 #, fuzzy, python-format #| msgid "Set changeset status" -msgid "SSH key %r not found" +msgid "SSH key with fingerprint %r found" msgstr "Změny" -#: kallithea/model/user.py:186 +#: kallithea/model/user.py:184 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:250 +#: kallithea/model/user.py:248 msgid "" "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:255 +#: kallithea/model/user.py:253 #, 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:260 +#: kallithea/model/user.py:258 #, 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:267 +#: kallithea/model/user.py:265 #, 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:361 +#: kallithea/model/user.py:359 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:406 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:407 #, python-format msgid "" "The password to your account %s has been changed using password reset " @@ -2332,7 +2334,7 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:66 -#: kallithea/templates/admin/settings/settings_visual.html:127 +#: kallithea/templates/admin/settings/settings_visual.html:129 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 @@ -3397,7 +3399,7 @@ #: kallithea/templates/admin/settings/settings_global.html:49 #: kallithea/templates/admin/settings/settings_vcs.html:65 -#: kallithea/templates/admin/settings/settings_visual.html:126 +#: kallithea/templates/admin/settings/settings_visual.html:128 #, fuzzy msgid "Save Settings" msgstr "Nastavení" @@ -3639,56 +3641,56 @@ "@{hostname}/{repo}'." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:67 #, fuzzy #| msgid "Repositories" msgid "Repository page size" msgstr "Repozitáře" -#: kallithea/templates/admin/settings/settings_visual.html:68 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:73 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Admin page size" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:76 +#: kallithea/templates/admin/settings/settings_visual.html:78 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:83 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:88 msgid "Show public repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "Show private repository icon on repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:95 +#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:100 +#: kallithea/templates/admin/settings/settings_visual.html:102 #, fuzzy msgid "Meta Tagging" msgstr "Nastavení" -#: kallithea/templates/admin/settings/settings_visual.html:105 +#: kallithea/templates/admin/settings/settings_visual.html:107 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:109 +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "Stylify recognised meta tags:" msgstr "" @@ -4320,23 +4322,23 @@ msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:96 +#: kallithea/templates/changeset/changeset.html:95 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:100 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:108 +#: kallithea/templates/changeset/changeset.html:106 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:122 +#: kallithea/templates/changeset/changeset.html:120 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/changeset/changeset.html:137 #: kallithea/templates/compare/compare_diff.html:59 #: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format @@ -4346,7 +4348,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/compare/compare_diff.html:61 #: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format @@ -4356,8 +4358,8 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:154 -#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/changeset/changeset.html:152 +#: kallithea/templates/changeset/changeset.html:171 #: kallithea/templates/compare/compare_diff.html:81 #: kallithea/templates/pullrequests/pullrequest_show.html:309 #: kallithea/templates/pullrequests/pullrequest_show.html:333 @@ -5344,45 +5346,45 @@ msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:371 +#: kallithea/templates/summary/statistics.html:85 +#: kallithea/templates/summary/summary.html:369 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:401 +#: kallithea/templates/summary/statistics.html:109 +#: kallithea/templates/summary/summary.html:399 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:403 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:404 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:405 -msgid "commits" +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:406 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:407 -msgid "files changed" +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:408 -msgid "files removed" +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:409 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:410 -msgid "commit" +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:411 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:412 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr ""