Mercurial > kallithea
changeset 4956:699689c31e0c
i18n: regenerate the translation template
| author | Andrew Shadura <andrew@shadura.me> |
|---|---|
| date | Wed, 01 Apr 2015 03:49:13 +0200 |
| parents | 4e6dfdb3fa01 |
| children | 5e7bdfbef29b |
| files | kallithea/i18n/kallithea.pot |
| diffstat | 1 files changed, 2256 insertions(+), 2066 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/i18n/kallithea.pot Tue Mar 31 22:15:38 2015 +0200 +++ b/kallithea/i18n/kallithea.pot Wed Apr 01 03:49:13 2015 +0200 @@ -1,87 +1,90 @@ # Translations template for Kallithea. -# Copyright (C) 2014 Various authors, licensing as GPLv3 +# Copyright (C) 2015 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. ##, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 0.1\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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\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 +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" +#: 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." msgstr "" @@ -96,12 +99,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 "" @@ -119,211 +122,282 @@ 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 @@ -335,23 +409,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 "" @@ -359,68 +434,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 "" @@ -429,62 +504,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 @@ -500,28 +568,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 "" @@ -543,26 +611,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 "" @@ -578,21 +646,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 "" @@ -622,180 +690,180 @@ 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 @@ -814,23 +882,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 "" @@ -839,106 +907,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 "" @@ -951,235 +1027,260 @@ 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 +#: 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 @@ -1189,12 +1290,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 @@ -1204,162 +1305,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 @@ -1369,12 +1470,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 @@ -1384,52 +1485,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 @@ -1438,8 +1533,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 @@ -1450,23 +1545,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 @@ -1474,8 +1556,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 @@ -1485,8 +1578,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 @@ -1496,19 +1589,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 @@ -1518,21 +1600,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 @@ -1540,32 +1622,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 @@ -1573,48 +1666,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 "" @@ -1640,246 +1711,280 @@ 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 -#, 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 +#: 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 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 "" @@ -1890,35 +1995,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 "" @@ -1935,164 +2041,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 "" @@ -2100,78 +2207,80 @@ 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 "" @@ -2190,38 +2299,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 +#, 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 "" @@ -2231,11 +2340,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 "" @@ -2252,154 +2361,154 @@ 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 @@ -2407,75 +2516,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 @@ -2483,118 +2586,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 @@ -2665,7 +2763,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 @@ -2686,7 +2783,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 @@ -2695,7 +2792,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 @@ -2711,113 +2808,72 @@ 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 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 @@ -2825,38 +2881,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 "" @@ -2866,7 +2922,7 @@ #: 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" +msgid "Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -2883,7 +2939,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 "" @@ -2909,7 +2965,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:72 -msgid "Write permission to repository groups allows creating repositories inside that group" +msgid "Write permission to a repository group allows creating repositories inside that group." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -2929,7 +2985,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 @@ -2940,7 +2996,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 @@ -2949,68 +3005,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 "" @@ -3034,7 +3085,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 "" @@ -3129,33 +3180,33 @@ msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +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" +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 @@ -3163,23 +3214,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 @@ -3188,7 +3240,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 "" @@ -3198,148 +3250,147 @@ #: 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." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 #, 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 -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 +#: 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 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 -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 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:69 +msgid "Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html: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 +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" +#, 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 -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" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:91 +msgid "The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Invalidate repository cache" +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" +msgid "Manually invalidate cache for this repository. On first access, the repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of cached values" +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:15 @@ -3352,12 +3403,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 "" @@ -3391,7 +3442,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 @@ -3399,19 +3450,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 @@ -3419,7 +3470,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 @@ -3428,13 +3479,14 @@ #: 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." +"In case this repository is renamed or moved into another group the 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 @@ -3455,15 +3507,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 "" @@ -3480,47 +3527,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 "" @@ -3589,33 +3636,37 @@ 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 -msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:55 +#: kallithea/templates/admin/settings/settings_global.html:51 +msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:56 #: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html: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 @@ -3623,10 +3674,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 "" @@ -3639,7 +3690,7 @@ msgstr "" #: 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." +msgid "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 @@ -3647,15 +3698,15 @@ 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" +msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3671,7 +3722,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_search.html:15 -msgid "This option completely reindexes all the files within Kallithea for proper fulltext search capabilities." +msgid "This option completely reindexeses all of the repositories for proper fulltext search capabilities." msgstr "" #: kallithea/templates/admin/settings/settings_search.html:21 @@ -3695,11 +3746,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 @@ -3707,7 +3758,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 @@ -3715,7 +3766,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 @@ -3727,7 +3778,7 @@ msgstr "" #: 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." +msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:24 @@ -3747,7 +3798,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 @@ -3759,11 +3810,11 @@ msgstr "" #: 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." +msgid "Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Repositories location" +msgid "Location of repositories" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:69 @@ -3771,7 +3822,7 @@ 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." +msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3800,8 +3851,8 @@ #: 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" +"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" @@ -3811,7 +3862,8 @@ #: 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 user username,\n" " {netloc} network location/server host of running Kallithea server,\n" @@ -3819,65 +3871,66 @@ " {repoid} ID of 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 -msgid "Parses meta tags from repository description field and turns them into colored tags." +#: kallithea/templates/admin/settings/settings_visual.html:111 +msgid "Parses meta tags from the repository description field and turns them into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html: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 "" @@ -3887,19 +3940,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 "" @@ -3918,7 +3966,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 "" @@ -3926,23 +3974,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 "" @@ -3950,18 +3990,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 "" @@ -3970,14 +4011,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" @@ -3989,6 +4030,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -4033,193 +4075,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 "" @@ -4278,85 +4310,83 @@ 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 +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 @@ -4364,26 +4394,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 "" @@ -4393,7 +4426,7 @@ msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:29 +#: kallithea/templates/branches/branches.html:26 msgid "Compare Branches" msgstr "" @@ -4409,303 +4442,333 @@ 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 +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 +#, 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 @@ -4713,18 +4776,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 "" @@ -4732,12 +4795,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 @@ -4748,30 +4811,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 +#, 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" @@ -4779,38 +4865,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 "" @@ -4819,17 +4910,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 @@ -4837,11 +4933,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 "" @@ -4849,65 +4945,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 "" @@ -4917,85 +4998,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 @@ -5003,8 +5080,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 "" @@ -5013,32 +5090,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" @@ -5083,12 +5156,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 "" @@ -5109,9 +5182,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 "" @@ -5124,31 +5197,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 "" @@ -5157,9 +5234,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 "" @@ -5167,131 +5244,234 @@ 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 +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:247 +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 @@ -5299,32 +5479,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 @@ -5333,27 +5523,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 "" @@ -5368,67 +5558,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 "" @@ -5437,78 +5627,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 "" @@ -5518,7 +5708,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 "" +