Mercurial > kallithea
changeset 4216:ca3c310df9a4 kallithea-2.2.5-rebrand
Regenerate i18n
line wrap: on
line diff
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -1,108 +1,111 @@ -# Translations template for Kallithea. +# German translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. # Translators: # stephanj <info@stephan-jauernick.de>, 2013 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" -"Language-Team: German (http://www.transifex.com/projects/p/Kallithea/language/de/)\n" +"Language-Team: German " +"(http://www.transifex.com/projects/p/Kallithea/language/de/)\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 + +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "Alle Branches" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" - -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +"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 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "Startseite" -#: kallithea/controllers/error.py:99 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "Die Anfrage konnte vom Server nicht ausgewertet werden weil sie einen Ungültigen Syntax nutzt" - -#: kallithea/controllers/error.py:102 +#: kallithea/controllers/error.py:101 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" +"Die Anfrage konnte vom Server nicht ausgewertet werden weil sie einen " +"Ungültigen Syntax nutzt" + +#: kallithea/controllers/error.py:104 msgid "Unauthorized access to resource" msgstr "Unauthorisierter Zugang zur Ressource" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "Du hast keine Rechte um diese Seite zu betrachten" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:108 msgid "The resource could not be found" msgstr "Die Ressource konnte nicht gefunden werden" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "Aufgrund einer Unerwarteten Gegebenheit konnte der Server diese Anfrage nicht vollenden" - -#: kallithea/controllers/feed.py:53 +msgstr "" +"Aufgrund einer Unerwarteten Gegebenheit konnte der Server diese Anfrage " +"nicht vollenden" + +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "Änderungen im %s Repository" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "%s %s Feed" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -112,405 +115,407 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "Während des Commitens trat ein Fehler auf" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "Keine Änderungen" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "Der Commit zu %s war erfolgreich" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "Kein Inhalt" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "Kein Dateiname" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:522 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "Leeres Repository" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "Unbekannter Archiv Typ" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "Änderungssätze" -#: kallithea/controllers/files.py:774 -#: kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "Entwicklungszweige" -#: kallithea/controllers/files.py:775 -#: kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "Währen des Forken des Repositorys trat ein Fehler auf: %s" -#: kallithea/controllers/home.py:81 +#: kallithea/controllers/home.py:86 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "Öffentliches Logbuch" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "Logbuch" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "Ihr Passwort Zurücksetzen link wurde versendet" -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "" -"Your password reset was successful, new password has been sent to your email" -msgstr "Das Zurücksetzen des Passworted war erfolgreich, ein neues Passwort wurde an ihre EMail Addresse gesendet" - -#: kallithea/controllers/pullrequests.py:138 +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" +"Das Zurücksetzen des Passworted war erfolgreich, ein neues Passwort wurde" +" an ihre EMail Addresse gesendet" + +#: kallithea/controllers/pullrequests.py:140 #: kallithea/templates/changeset/changeset.html:13 #: kallithea/templates/email_templates/changeset_comment.html:15 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "Lesezeichen" -#: kallithea/controllers/pullrequests.py:328 +#: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: kallithea/controllers/pullrequests.py:330 +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "Währen des abschicken des Pullrequests trat ein Fehler auf" -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "" -#: kallithea/controllers/pullrequests.py:520 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" - -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/pullrequests.py:522 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "Ungültige Suchanfrage. Versuchen sie es in Anführungzeichen zu setzen." -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer ausführen" -#: kallithea/controllers/search.py:142 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "Während dieser Such Operation trat ein Fehler auf" -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "Es wurden bisher keine Daten geladen" -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "Statistiken sind deaktiviert für dieses Repository" -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" +msgid "forever" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: 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 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" -msgstr "Sie können diesen User nicht editieren da er für die ganze Applikation von entscheidender bedeutung ist." - -#: kallithea/controllers/admin/my_account.py:125 +msgstr "" +"Sie können diesen User nicht editieren da er für die ganze Applikation " +"von entscheidender bedeutung ist." + +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "Die EMail Addresse %s wurde zum Benutzer hinzugefügt" -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "Währen der Speicherung der EMail Addresse trat ein Fehler auf" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "Die EMail Addresse wurde vom Benutzer entfernt" -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Keine" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "Lesen" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" -msgstr "Schreiben" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Keine" #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 +msgid "Read" +msgstr "Lesen" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "Schreiben" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -529,467 +534,444 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "Admin" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 msgid "Disabled" msgstr "Deaktiviert" -#: kallithea/controllers/admin/permissions.py:76 -msgid "Allowed with manual account activation" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "Aktiviert" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "Die Gruppe enthält %s Repositorys und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "%s konnte nicht gelöscht werden da es immernoch Forks enthält" -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "Beim Löschen von %s trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "Sichtbarkeit des Repositorys im Öffentlichen Logbuch aktualisiert" -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" -msgstr "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses Repositorys im Öffentlichen Logbuch auf" - -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +msgstr "" +"Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses " +"Repositorys im Öffentlichen Logbuch auf" + +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "Schlüssel stimmt nicht überein" -#: kallithea/controllers/admin/repos.py:544 +#: kallithea/controllers/admin/repos.py:546 msgid "Nothing" msgstr "Nichts" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "Während dieser operation trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:596 -msgid "Locked" -msgstr "" - #: kallithea/controllers/admin/repos.py:598 +msgid "Locked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "Währen der Cache Invalidierung trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "Von entferntem Ort übertragen" -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" -msgstr "Es trat ein Fehler auf während das Repository von einem Entfernten Speicherort übertragen wurde" - -#: kallithea/controllers/admin/repos.py:671 +msgstr "" +"Es trat ein Fehler auf während das Repository von einem Entfernten " +"Speicherort übertragen wurde" + +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "Während des löschens der Repository Statistiken trat ein Fehler auf" -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: kallithea/controllers/admin/settings.py:269 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "Aktualisiere Applikations Einstellungen" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "" -"Your license will expire on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "" -"Your license has expired on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:571 -msgid "" -"Unexpected error while reading license key. Please make sure your license " -"token and key are correct" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "Der Benutzer wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "Während der Löschen des Benutzers trat ein Fehler auf" -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "Sie können diesen Benutzer nicht editieren" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "Sie müssen sich anmelden um diese Seite aufzurufen" -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:80 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das Diff Menü um die Unterschiede anzuzeigen" - -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:82 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das " +"Diff Menü um die Unterschiede anzuzeigen" + +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "Keine Änderungen erkannt" @@ -1025,8 +1007,7 @@ msgid "%s more" msgstr "%s mehr" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "revisionen" @@ -1121,138 +1102,112 @@ msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr "und %s weitere" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "Keine Dateien" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, 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 "Das %s Repository ist nicht in der Datenbank vorhanden, eventuell wurde es im Dateisystem erstellt oder umbenannt. Bitte starten sie die Applikation erneut um die Repositories neu zu Indizieren" - -#: kallithea/lib/utils2.py:413 +"%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 "" +"Das %s Repository ist nicht in der Datenbank vorhanden, eventuell wurde " +"es im Dateisystem erstellt oder umbenannt. Bitte starten sie die " +"Applikation erneut um die Repositories neu zu Indizieren" + +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%s ago" msgstr "vor %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:440 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "%s und %s her" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" msgstr "jetzt gerade" -#: 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: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:1659 -msgid "Repository no access" -msgstr "Kein Zugriff auf Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py: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:1660 -msgid "Repository read access" -msgstr "Lesender Zugriff auf Repository" - #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 @@ -1265,8 +1220,8 @@ #: 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 write access" -msgstr "Schreibdender Zugriff auf Repository" +msgid "Repository no access" +msgstr "Kein Zugriff auf Repository" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 @@ -1280,159 +1235,159 @@ #: 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 admin access" -msgstr "Administrativer Zugang zum Repository" +msgid "Repository read access" +msgstr "Lesender Zugriff auf Repository" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" +msgstr "Schreibdender Zugriff auf Repository" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no access" -msgstr "Repository Gruppe hat Keinen Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repositories Group read access" -msgstr "Repository Gruppe hat lesenden Zugriff" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 +msgid "Repository admin access" +msgstr "Administrativer Zugang zum Repository" #: kallithea/lib/dbmigrate/schema/db_1_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 "Repositories Group write access" -msgstr "Repository Gruppe hat schreibenden Zugriff" +msgid "Repositories Group no access" +msgstr "Repository Gruppe hat Keinen Zugriff" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repositories Group admin access" -msgstr "Repository Gruppe hat Administrativen Zugriff" +msgid "Repositories Group read access" +msgstr "Repository Gruppe hat lesenden Zugriff" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 +msgid "Repositories Group write access" +msgstr "Repository Gruppe hat schreibenden Zugriff" #: 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 -#: 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:1657 -msgid "Kallithea Administrator" -msgstr "Kallithea Administrator" - -#: 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: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:1680 -msgid "Repository creation disabled" -msgstr "Repository erstelllung deaktiviert" +msgid "Repositories Group admin access" +msgstr "Repository Gruppe hat Administrativen Zugriff" #: 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: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:1681 -msgid "Repository creation enabled" -msgstr "Repository erstellung aktiviert" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 +msgid "Kallithea Administrator" +msgstr "Kallithea Administrator" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 +msgid "Repository creation disabled" +msgstr "Repository erstelllung deaktiviert" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking 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: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:1686 -msgid "Repository forking enabled" -msgstr "" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" +msgstr "Repository erstellung aktiviert" #: 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 -msgid "Register disabled" -msgstr "Registrierung deaktiviert" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" +msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "Registrierung deaktiviert" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 msgid "Register new user with Kallithea with manual activation" msgstr "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" msgstr "Registrierung neuer Benutzer in Kallithea mit Automatischer Aktivierung" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: 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:2210 -msgid "Not Reviewed" -msgstr "Nicht Begutachtet" - -#: 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: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:2211 -msgid "Approved" -msgstr "Akzeptiert" - #: 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:1765 @@ -1445,8 +1400,8 @@ #: 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 "Rejected" -msgstr "Abgelehnt" +msgid "Not Reviewed" +msgstr "Nicht Begutachtet" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 @@ -1460,45 +1415,51 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 +msgid "Approved" +msgstr "Akzeptiert" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 +msgid "Rejected" +msgstr "Abgelehnt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 msgid "Under Review" msgstr "In Begutachtung" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 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:1664 -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:1665 -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 @@ -1508,7 +1469,7 @@ #: 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 write access" +msgid "Repository group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1520,9 +1481,22 @@ #: 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 admin access" -msgstr "" - +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_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 @@ -1531,18 +1505,7 @@ #: 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 "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:1670 -msgid "User group read access" +msgid "Repository group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1553,7 +1516,7 @@ #: 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 write access" +msgid "User group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1564,7 +1527,18 @@ #: 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 admin access" +msgid "User group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1575,20 +1549,20 @@ #: 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 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:1675 -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 @@ -1597,42 +1571,31 @@ #: 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 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 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:1688 -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:1689 -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 @@ -1641,27 +1604,47 @@ #: 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 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:75 +#: 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 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "in Zeile %s" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "[Mention]" @@ -1687,73 +1670,77 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:230 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:231 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - #: kallithea/model/notification.py:232 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:233 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:234 #, python-format +msgid "%(user)s registered in Kallithea at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:235 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:236 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" -msgstr "Sie können diesen User nicht editieren da er für die ganze Applikation von entscheidender bedeutung ist." - -#: kallithea/model/user.py:268 +msgstr "" +"Sie können diesen User nicht editieren da er für die ganze Applikation " +"von entscheidender bedeutung ist." + +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" -msgstr "Sie können diesen User nicht löschen da er für die ganze Applikation von entscheidender bedeutung ist." - -#: kallithea/model/user.py:274 +msgstr "" +"Sie können diesen User nicht löschen da er für die ganze Applikation von " +"entscheidender bedeutung ist." + +#: 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:302 +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" + +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "" @@ -1774,8 +1761,8 @@ #: kallithea/model/validators.py:124 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" msgstr "" #: kallithea/model/validators.py:151 @@ -1853,7 +1840,9 @@ #: kallithea/model/validators.py:376 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" -msgstr "Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe \"%(group)s\"" +msgstr "" +"Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe " +"\"%(group)s\"" #: kallithea/model/validators.py:378 #, python-format @@ -1903,9 +1892,11 @@ #: kallithea/model/validators.py:791 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" -msgstr "Das LDAP Login Attribut des CN muss angeben werden - Es ist der Name des Attributes welches das Equivalent zum \"Benutzername\" ist" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" +"Das LDAP Login Attribut des CN muss angeben werden - Es ist der Name des " +"Attributes welches das Equivalent zum \"Benutzername\" ist" #: kallithea/model/validators.py:804 #, python-format @@ -1918,8 +1909,7 @@ #: kallithea/model/validators.py:837 #, python-format -msgid "" -"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" #: kallithea/model/validators.py:870 @@ -1935,6 +1925,10 @@ 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "Übersichtsseite" @@ -2056,7 +2050,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2068,7 +2062,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2084,7 +2078,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2096,8 +2090,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 -#: kallithea/templates/base/root.html:73 +#: 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 @@ -2107,7 +2100,7 @@ msgstr "Lade..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "" @@ -2122,14 +2115,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 msgid "Username" msgstr "Benutzername" #: kallithea/templates/login.html:52 kallithea/templates/register.html:49 #: kallithea/templates/admin/my_account/my_account.html:39 #: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "Passwort" @@ -2145,7 +2138,7 @@ msgid "Forgot your password ?" msgstr "Passowrt Vergessen?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "Kein Account?" @@ -2244,7 +2237,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "Admin Logbuch" @@ -2306,7 +2299,7 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "" @@ -2329,12 +2322,12 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "" @@ -2368,7 +2361,7 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "" @@ -2543,7 +2536,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2618,7 +2610,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "Mein Account" @@ -2796,8 +2788,8 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:26 msgid "" -"Your user is in an external Source of Record; some details cannot be managed" -" here" +"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 @@ -2847,7 +2839,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2874,7 +2866,7 @@ msgstr "Kommentare" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "" @@ -2892,7 +2884,7 @@ msgstr "Zeige Benachrichtigung" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "Benachrichtigungen" @@ -2905,7 +2897,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "Rechte" @@ -2936,8 +2928,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2983,8 +2975,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to repository groups allows creating repositories inside" +" that group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3032,7 +3024,7 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "" @@ -3078,8 +3070,7 @@ #: 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:77 -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "Einstellungen" @@ -3205,8 +3196,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 @@ -3254,14 +3245,15 @@ #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 #: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 #: kallithea/templates/forks/fork.html:55 msgid "Optionaly select a group to put this repository into." -msgstr "Wähle optional eine Gruppe in welcher das Repository platziert werden soll." +msgstr "" +"Wähle optional eine Gruppe in welcher das Repository platziert werden " +"soll." #: kallithea/templates/admin/repos/repo_add_base.html:63 msgid "Type of repository to create." @@ -3291,8 +3283,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:30 #, python-format msgid "" -"Repository \"%(repo_name)s\" is beeing created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:42 @@ -3354,9 +3346,11 @@ #: 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 "Alle Aktionen die in diesem Repository durchgeführt wurden sind für jeden Zugänglich im Öffentlichen Logbuch" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" +"Alle Aktionen die in diesem Repository durchgeführt wurden sind für jeden" +" Zugänglich im Öffentlichen Logbuch" #: kallithea/templates/admin/repos/repo_edit_advanced.html:49 msgid "Change locking" @@ -3384,9 +3378,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:73 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Trigering a pull locks repository by user who pulled, only the same user can" -" unlock by doing a push" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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 @@ -3416,9 +3410,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" +"This repository will be renamed in a special way in order to be " +"unaccesible for Kallithea and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 @@ -3431,8 +3425,8 @@ #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 @@ -3525,9 +3519,12 @@ #: 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 allways be accessible under such url.\n" -" Usefull 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 above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull 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 @@ -3621,10 +3618,6 @@ msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "" @@ -3707,12 +3700,11 @@ #: kallithea/templates/admin/settings/settings_global.html:50 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" +"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_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3724,8 +3716,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3736,57 +3728,6 @@ msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "" -"Please enter following lines (if yet not present) into [app:main] section of" -" your .ini file. The token below is autogenerated." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "" @@ -3797,8 +3738,9 @@ #: 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." +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3807,8 +3749,8 @@ #: 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." +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 @@ -3817,8 +3759,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallitheas GIT hooks are installed for each repository. Current" +" hooks will be updated to latest version" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3844,6 +3786,10 @@ msgstr "Erneut Indizieren" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "" @@ -3933,14 +3879,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this" -" value a restart and rescan of the repository folder are required." +"Filesystem location where repositories should be stored. After changing " +"this value a restart and rescan of the repository folder are required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3970,22 +3916,34 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar url allows you to use other avatar server application.\n" -" Following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:54 @@ -3994,8 +3952,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:58 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:64 @@ -4043,7 +4001,7 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "" @@ -4127,7 +4085,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "Benutzer" @@ -4197,8 +4155,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4238,50 +4196,50 @@ msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4291,112 +4249,112 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:182 -msgid "Unfollow" -msgstr "" - #: kallithea/templates/base/base.html:185 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "Logbuch" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "Öffentliches Logbuch" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:321 -msgid "Gists" -msgstr "" - #: kallithea/templates/base/base.html:324 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:325 -msgid "All public gists" +msgid "Gists" msgstr "" #: kallithea/templates/base/base.html:327 -msgid "My public gists" +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:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "" @@ -4407,8 +4365,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4457,84 +4415,84 @@ msgid "No permission defined" msgstr "" +#: kallithea/templates/base/root.html:45 +msgid "Add another comment" +msgstr "" + +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/data_table/_dt_elements.html:216 +msgid "Stop following this repository" +msgstr "" + #: kallithea/templates/base/root.html:47 -msgid "Add another comment" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:48 -#: kallithea/templates/data_table/_dt_elements.html:216 -msgid "Stop following this repository" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:49 -msgid "Start following this repository" -msgstr "" +msgid "members" +msgstr "mitglieder" #: kallithea/templates/base/root.html:50 -msgid "Group" +#: kallithea/templates/pullrequests/pullrequest.html:202 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:51 -msgid "members" -msgstr "mitglieder" +msgid "loading ..." +msgstr "" #: kallithea/templates/base/root.html:52 -#: kallithea/templates/pullrequests/pullrequest.html:202 -msgid "Loading ..." +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:53 -msgid "loading ..." +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:54 -msgid "Search truncated" +#: 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 "No matching files" +msgid "Open new pull request for selected changesets" msgstr "" #: kallithea/templates/base/root.html:56 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +msgid "Show selected changesets __S -> __E" msgstr "" #: kallithea/templates/base/root.html:57 -msgid "Open new pull request for selected changesets" +msgid "Show selected changeset __S" msgstr "" #: kallithea/templates/base/root.html:58 -msgid "Show selected changesets __S -> __E" +msgid "Selection link" msgstr "" #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse diff" msgstr "" #: kallithea/templates/base/root.html:60 -msgid "Selection link" +msgid "Expand diff" msgstr "" #: kallithea/templates/base/root.html:61 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:62 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:63 -msgid "Failed to revoke permission" -msgstr "" - -#: kallithea/templates/base/root.html:64 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr "" @@ -4843,8 +4801,7 @@ #: 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" +msgid "Use @username inside this text to send notification to this Kallithea user" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:73 @@ -5032,7 +4989,8 @@ #: 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." +"%s opened a pull request for repository %s and wants you to review " +"changes." msgstr "" #: kallithea/templates/email_templates/pull_request.html:8 @@ -5702,3 +5660,4 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "" +
--- a/kallithea/i18n/en/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/en/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-06-01 18:38+0200\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -17,822 +17,939 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: kallithea/controllers/changelog.py:149 +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 +msgid "There are no changesets yet" +msgstr "" + +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "" -#: kallithea/controllers/changeset.py:84 +#: kallithea/controllers/changelog.py:189 +msgid "(closed)" +msgstr "" + +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "" -#: kallithea/controllers/changeset.py:91 kallithea/controllers/changeset.py:98 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "" -#: kallithea/controllers/changeset.py:164 +#: kallithea/controllers/changeset.py:167 #, python-format -msgid "%s line context" -msgstr "" - -#: kallithea/controllers/changeset.py:345 -#: kallithea/controllers/pullrequests.py:481 +msgid "increase diff context to %(num)s lines" +msgstr "" + +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 +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:376 +#: kallithea/controllers/changeset.py:386 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" -#: kallithea/controllers/compare.py:74 -#: kallithea/controllers/pullrequests.py:259 -msgid "There are no changesets yet" -msgstr "" - -#: kallithea/controllers/error.py:69 +#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 +#, fuzzy +msgid "Select changeset" +msgstr "" + +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "" -#: kallithea/controllers/error.py:98 -msgid "The request could not be understood by the server due to malformed syntax." -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:103 +#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:108 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:52 +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "" -#: kallithea/controllers/feed.py:53 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:86 -#: kallithea/templates/changeset/changeset.html:141 -#: kallithea/templates/changeset/changeset.html:153 -#: kallithea/templates/compare/compare_diff.html:58 -#: kallithea/templates/compare/compare_diff.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -#: kallithea/templates/pullrequests/pullrequest_show.html:195 +#: 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 msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:90 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:93 #, python-format -msgid "There are no files yet %s" -msgstr "" - -#: kallithea/controllers/files.py:271 kallithea/controllers/files.py:339 +msgid "There are no files yet. %s" +msgstr "" + +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:283 -msgid "You can only edit files with revision being a valid branch " -msgstr "" - -#: kallithea/controllers/files.py:297 -#, python-format -msgid "Edited file %s via Kallithea" -msgstr "" - #: kallithea/controllers/files.py:313 +msgid "You can only delete files with revision being a valid branch " +msgstr "" + +#: kallithea/controllers/files.py:324 +#, python-format +msgid "Deleted file %s via Kallithea" +msgstr "" + +#: kallithea/controllers/files.py:346 +#, python-format +msgid "Successfully deleted file %s" +msgstr "" + +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 +msgid "Error occurred during commit" +msgstr "" + +#: kallithea/controllers/files.py:373 +msgid "You can only edit files with revision being a valid branch " +msgstr "" + +#: kallithea/controllers/files.py:387 +#, python-format +msgid "Edited file %s via Kallithea" +msgstr "" + +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:322 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:327 kallithea/controllers/files.py:405 -msgid "Error occurred during commit" -msgstr "" - -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:368 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:397 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:431 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:442 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:446 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:631 -#: kallithea/templates/changeset/changeset_range.html:9 +#: 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:124 +#: kallithea/templates/pullrequests/pullrequest.html:123 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:632 kallithea/controllers/pullrequests.py:152 -#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:682 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:633 kallithea/controllers/pullrequests.py:153 -#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:693 -#: kallithea/templates/switch_to_list.html:15 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 +#: kallithea/templates/switch_to_list.html:25 +#: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:176 -#, python-format -msgid "Forked repository %s as %s" -msgstr "" - -#: kallithea/controllers/forks.py:190 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/journal.py:110 kallithea/controllers/journal.py:153 -msgid "public journal" +#: kallithea/controllers/home.py:86 +msgid "Groups" +msgstr "" + +#: kallithea/controllers/home.py:91 +#: 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/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 +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 +msgid "Branch" +msgstr "" + +#: kallithea/controllers/home.py:138 +msgid "Tag" +msgstr "" + +#: kallithea/controllers/home.py:144 +msgid "Bookmark" msgstr "" #: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 -#: kallithea/templates/journal/journal.html:12 +msgid "public journal" +msgstr "" + +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 +#: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "" -#: kallithea/controllers/login.py:138 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 +msgid "bad captcha" +msgstr "" + +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:159 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "" -#: kallithea/controllers/login.py:179 +#: kallithea/controllers/login.py:257 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "" -#: kallithea/controllers/pullrequests.py:139 -#: kallithea/templates/changeset/changeset.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:8 +#: 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:149 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:150 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:151 kallithea/model/scm.py:688 -#: kallithea/templates/switch_to_list.html:28 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 +#: kallithea/templates/switch_to_list.html:38 +#: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:324 +#: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: kallithea/controllers/pullrequests.py:326 -msgid "Error creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:346 +#: kallithea/controllers/pullrequests.py:332 +#, python-format +msgid "Error creating pull request: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:349 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:388 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:484 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "" -#: kallithea/controllers/pullrequests.py:521 +#: kallithea/controllers/pullrequests.py:522 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" -#: kallithea/controllers/search.py:132 +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "" -#: kallithea/controllers/search.py:137 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: kallithea/controllers/search.py:141 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "" -#: kallithea/controllers/summary.py:182 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "" -#: kallithea/controllers/summary.py:188 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/controllers/summary.py:206 +#: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/defaults.py:96 +#: kallithea/controllers/admin/auth_settings.py:127 +msgid "Auth settings updated successfully" +msgstr "" + +#: kallithea/controllers/admin/auth_settings.py:138 +msgid "error occurred during update of auth settings" +msgstr "" + +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:110 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:56 -msgid "forever" -msgstr "" - -#: kallithea/controllers/admin/gists.py:57 -#, fuzzy -msgid "5 minutes" -msgstr "" - -#: kallithea/controllers/admin/gists.py:58 -#, fuzzy -msgid "1 hour" -msgstr "" - -#: kallithea/controllers/admin/gists.py:59 -#, fuzzy -msgid "1 day" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:289 +msgid "forever" +msgstr "" + +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:258 +#: kallithea/controllers/admin/users.py:290 #, fuzzy -msgid "1 month" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:291 +#, fuzzy +msgid "1 hour" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/users.py:292 +#, fuzzy +msgid "1 day" +msgstr "" + +#: kallithea/controllers/admin/gists.py:64 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:293 +#, fuzzy +msgid "1 month" +msgstr "" + +#: kallithea/controllers/admin/gists.py:68 +#: kallithea/controllers/admin/my_account.py:263 +#: kallithea/controllers/admin/users.py:295 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:127 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:165 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/ldap_settings.py:50 -msgid "BASE" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:51 -msgid "ONELEVEL" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:52 -msgid "SUBTREE" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:56 -msgid "NEVER" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:57 -msgid "ALLOW" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:58 -msgid "TRY" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:59 -msgid "DEMAND" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:60 -msgid "HARD" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:64 -msgid "No encryption" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:65 -msgid "LDAPS connection" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:66 -msgid "START_TLS on LDAP connection" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:124 -msgid "LDAP settings updated successfully" -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:128 -msgid "Unable to activate ldap. The \"python-ldap\" library is missing." -msgstr "" - -#: kallithea/controllers/admin/ldap_settings.py:145 -msgid "Error occurred during update of ldap settings" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:58 +#: kallithea/controllers/admin/gists.py:234 +msgid "unmodified" +msgstr "" + +#: kallithea/controllers/admin/gists.py:263 +msgid "Successfully updated gist content" +msgstr "" + +#: kallithea/controllers/admin/gists.py:268 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:271 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:70 +msgid "You can't edit this user since it's crucial for entire application" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:127 +msgid "Your account was updated successfully" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:161 +msgid "Successfully updated password" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:171 +msgid "Error occurred during update of user password" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 +#, python-format +msgid "Added email %s to user" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 +msgid "An error occurred during email saving" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 +msgid "Removed email from user" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 +msgid "Api key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 +msgid "Api key successfully reset" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 +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:59 #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 msgid "Read" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 msgid "Write" msgstr "" -#: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 -#: kallithea/templates/admin/defaults/defaults.html:9 -#: kallithea/templates/admin/ldap/ldap.html:9 -#: kallithea/templates/admin/permissions/permissions.html:9 -#: 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/repos_groups/repos_groups_add.html:9 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:9 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:11 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:13 -#: kallithea/templates/admin/settings/hooks.html:9 -#: kallithea/templates/admin/settings/settings.html:9 -#: kallithea/templates/admin/users/user_add.html:8 -#: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit.html:133 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/admin/users/users.html:85 -#: kallithea/templates/admin/users_groups/users_group_add.html:8 -#: kallithea/templates/admin/users_groups/users_group_edit.html:9 -#: kallithea/templates/admin/users_groups/users_groups.html:9 -#: kallithea/templates/base/base.html:317 -#: kallithea/templates/base/base.html:318 -#: kallithea/templates/base/base.html:324 -#: kallithea/templates/base/base.html:325 +#: 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/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 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:72 -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:92 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:74 -msgid "Allowed with manual account activation" -msgstr "" - #: kallithea/controllers/admin/permissions.py:76 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 kallithea/model/db.py:1444 -msgid "Manual activation of external account" +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" msgstr "" #: kallithea/controllers/admin/permissions.py:80 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 kallithea/model/db.py:1445 -msgid "Automatic activation of external account" +msgid "Allowed with automatic account activation" +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 +msgid "Manual activation of external account" msgstr "" #: kallithea/controllers/admin/permissions.py:84 -#: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 +#: 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 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:138 -msgid "Default permissions updated successfully" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:152 +#: kallithea/controllers/admin/permissions.py:125 +msgid "Global permissions updated successfully" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repos.py:128 -msgid "--REMOVE FORK--" -msgstr "" - -#: kallithea/controllers/admin/repos.py:168 +#: kallithea/controllers/admin/repo_groups.py:186 +#, python-format +msgid "Created repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:198 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:256 +#, python-format +msgid "Updated repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:271 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:289 +#, python-format +msgid "This group contains %s repositores and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format -msgid "Created repository %s from %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:174 +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:302 +#, python-format +msgid "Removed repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format -msgid "Created repository %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:197 +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 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:434 +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 +msgid "An error occurred during revoking of permission" +msgstr "" + +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:270 +#: kallithea/controllers/admin/repos.py:237 +#, python-format +msgid "Created repository %s from %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:246 +#, python-format +msgid "Forked repository %s as %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:249 +#, python-format +msgid "Created repository %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:315 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:323 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:326 -#, python-format -msgid "Cannot delete %s it still contains attached forks" -msgstr "" - -#: kallithea/controllers/admin/repos.py:331 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "" - #: kallithea/controllers/admin/repos.py:345 +#, python-format +msgid "Cannot delete %s it still contains attached forks" +msgstr "" + +#: kallithea/controllers/admin/repos.py:350 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:375 -#: kallithea/controllers/admin/repos_groups.py:332 -#: kallithea/controllers/admin/users_groups.py:312 -msgid "An error occurred during revoking of permission" -msgstr "" - -#: kallithea/controllers/admin/repos.py:392 -msgid "An error occurred during deletion of repository stats" -msgstr "" - -#: kallithea/controllers/admin/repos.py:409 -msgid "An error occurred during cache invalidation" -msgstr "" - -#: kallithea/controllers/admin/repos.py:429 -#: kallithea/controllers/admin/repos.py:456 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:447 -msgid "Unlocked" -msgstr "" - -#: kallithea/controllers/admin/repos.py:450 -msgid "Locked" -msgstr "" - -#: kallithea/controllers/admin/repos.py:452 -#, python-format -msgid "Repository has been %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:458 +msgid "An error occurred during creation of field" +msgstr "" + +#: kallithea/controllers/admin/repos.py:472 +msgid "An error occurred during removal of field" +msgstr "" + +#: kallithea/controllers/admin/repos.py:488 +msgid "-- Not a fork --" +msgstr "" + +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:480 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:485 kallithea/model/validators.py:302 +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:498 -msgid "Pulled from remote location" -msgstr "" - -#: kallithea/controllers/admin/repos.py:501 -msgid "An error occurred during pull from remote location" -msgstr "" - -#: kallithea/controllers/admin/repos.py:517 +#: kallithea/controllers/admin/repos.py:546 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:519 +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:523 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:562 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:576 -msgid "An error occurred during removal of field" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:147 -#, python-format -msgid "Created repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:159 -#, python-format -msgid "Error occurred during creation of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:217 -#, python-format -msgid "Updated repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:232 +#: kallithea/controllers/admin/repos.py:571 +msgid "Locked repository" +msgstr "" + +#: kallithea/controllers/admin/repos.py:574 +msgid "Unlocked repository" +msgstr "" + +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 +msgid "An error occurred during unlocking" +msgstr "" + +#: kallithea/controllers/admin/repos.py:595 +msgid "Unlocked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:598 +msgid "Locked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:600 #, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:250 -#, python-format -msgid "This group contains %s repositores and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:257 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:263 -#, python-format -msgid "Removed repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:268 -#, python-format -msgid "Error occurred during deletion of repos group %s" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:279 -#: kallithea/controllers/admin/repos_groups.py:314 -#: kallithea/controllers/admin/users_groups.py:300 -msgid "Cannot revoke permission for yourself as admin" -msgstr "" - -#: kallithea/controllers/admin/repos_groups.py:294 -msgid "Repository Group permissions updated" -msgstr "" - -#: kallithea/controllers/admin/settings.py:123 +msgid "Repository has been %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:618 +msgid "Cache invalidation successful" +msgstr "" + +#: kallithea/controllers/admin/repos.py:622 +msgid "An error occurred during cache invalidation" +msgstr "" + +#: kallithea/controllers/admin/repos.py:637 +msgid "Pulled from remote location" +msgstr "" + +#: kallithea/controllers/admin/repos.py:640 +msgid "An error occurred during pull from remote location" +msgstr "" + +#: kallithea/controllers/admin/repos.py:673 +msgid "An error occurred during deletion of repository stats" +msgstr "" + +#: kallithea/controllers/admin/settings.py:172 +msgid "Updated VCS settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:176 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:182 +#: 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" msgstr "" -#: kallithea/controllers/admin/settings.py:132 -msgid "Whoosh reindex task scheduled" -msgstr "" - -#: kallithea/controllers/admin/settings.py:163 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:167 -#: kallithea/controllers/admin/settings.py:304 -msgid "Error occurred during updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:219 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:224 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:300 -msgid "Updated VCS settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:314 +#: kallithea/controllers/admin/settings.py:358 +msgid "Please enter email address" +msgstr "" + +#: kallithea/controllers/admin/settings.py:370 +msgid "Send email task created" +msgstr "" + +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:349 -msgid "Email task created" -msgstr "" - -#: kallithea/controllers/admin/settings.py:413 -msgid "You can't edit this user since it's crucial for entire application" -msgstr "" - -#: kallithea/controllers/admin/settings.py:455 -msgid "Your account was updated successfully" -msgstr "" - -#: kallithea/controllers/admin/settings.py:470 -#: kallithea/controllers/admin/users.py:198 +#: kallithea/controllers/admin/settings.py:444 +msgid "Whoosh reindex task scheduled" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:150 +#, python-format +msgid "Created user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:161 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:199 +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:221 #, python-format -msgid "Error occurred during update of user %s" -msgstr "" - -#: kallithea/controllers/admin/users.py:130 +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:239 +msgid "Successfully deleted user group" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:244 +msgid "An error occurred during deletion of user group" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:311 +msgid "Target group cannot be the same" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:317 +msgid "User Group permissions updated" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 +msgid "Updated permissions" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 +msgid "An error occurred during permissions saving" +msgstr "" + +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:142 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:176 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:214 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:219 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:234 +#: 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 msgid "You can't edit this user" msgstr "" -#: kallithea/controllers/admin/users.py:293 -#: kallithea/controllers/admin/users_groups.py:372 -msgid "Updated permissions" -msgstr "" - -#: kallithea/controllers/admin/users.py:297 -#: kallithea/controllers/admin/users_groups.py:376 -msgid "An error occurred during permissions saving" -msgstr "" - -#: kallithea/controllers/admin/users.py:311 -#, python-format -msgid "Added email %s to user" -msgstr "" - -#: kallithea/controllers/admin/users.py:317 -msgid "An error occurred during email saving" -msgstr "" - -#: kallithea/controllers/admin/users.py:327 -msgid "Removed email from user" -msgstr "" - -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/users.py:483 #, python-format -msgid "Added ip %s to user" -msgstr "" - -#: kallithea/controllers/admin/users.py:346 +msgid "Added ip %s to user whitelist" +msgstr "" + +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:358 -msgid "Removed ip from user" -msgstr "" - -#: kallithea/controllers/admin/users_groups.py:162 -#, python-format -msgid "Created user group %s" -msgstr "" - -#: kallithea/controllers/admin/users_groups.py:173 -#, python-format -msgid "Error occurred during creation of user group %s" -msgstr "" - -#: kallithea/controllers/admin/users_groups.py:210 -#, python-format -msgid "Updated user group %s" -msgstr "" - -#: kallithea/controllers/admin/users_groups.py:232 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/users_groups.py:250 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/users_groups.py:255 -msgid "An error occurred during deletion of user group" -msgstr "" - -#: kallithea/controllers/admin/users_groups.py:274 -msgid "Target group cannot be the same" -msgstr "" - -#: kallithea/controllers/admin/users_groups.py:280 -msgid "User Group permissions updated" -msgstr "" - -#: kallithea/lib/auth.py:544 +#: kallithea/controllers/admin/users.py:503 +msgid "Removed ip address from user whitelist" +msgstr "" + +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:593 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:634 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "" @@ -848,176 +965,163 @@ msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:428 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "" - -#: kallithea/lib/helpers.py:539 -msgid "True" -msgstr "" - -#: kallithea/lib/helpers.py:542 -msgid "False" -msgstr "" - -#: kallithea/lib/helpers.py:580 +#: kallithea/lib/helpers.py:598 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:583 +#: kallithea/lib/helpers.py:601 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:596 +#: kallithea/lib/helpers.py:614 msgid "Changeset not found" msgstr "" -#: kallithea/lib/helpers.py:646 +#: kallithea/lib/helpers.py:664 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:652 +#: kallithea/lib/helpers.py:670 msgid "compare view" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:690 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:673 +#: kallithea/lib/helpers.py:691 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:674 kallithea/templates/changelog/changelog.html:53 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:716 #, python-format msgid "fork name %s" msgstr "" -#: kallithea/lib/helpers.py:715 -#: kallithea/templates/pullrequests/pullrequest_show.html:8 +#: kallithea/lib/helpers.py:733 +#: kallithea/templates/pullrequests/pullrequest_show.html:11 #, python-format msgid "Pull request #%s" msgstr "" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:743 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:727 kallithea/lib/helpers.py:739 +#: kallithea/lib/helpers.py:745 kallithea/lib/helpers.py:757 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:729 -msgid "[created] repository as fork" -msgstr "" - -#: kallithea/lib/helpers.py:731 kallithea/lib/helpers.py:741 -msgid "[forked] repository" -msgstr "" - -#: kallithea/lib/helpers.py:733 kallithea/lib/helpers.py:743 -msgid "[updated] repository" -msgstr "" - -#: kallithea/lib/helpers.py:735 -msgid "[downloaded] archive from repository" -msgstr "" - -#: kallithea/lib/helpers.py:737 -msgid "[delete] repository" -msgstr "" - -#: kallithea/lib/helpers.py:745 -msgid "[created] user" -msgstr "" - #: kallithea/lib/helpers.py:747 -msgid "[updated] user" -msgstr "" - -#: kallithea/lib/helpers.py:749 -msgid "[created] user group" -msgstr "" - -#: kallithea/lib/helpers.py:751 -msgid "[updated] user group" +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 "[commented] on revision in repository" +msgid "[downloaded] archive from repository" msgstr "" #: kallithea/lib/helpers.py:755 -msgid "[commented] on pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:757 -msgid "[closed] pull request for" -msgstr "" - -#: kallithea/lib/helpers.py:759 -msgid "[pushed] into" -msgstr "" - -#: kallithea/lib/helpers.py:761 -msgid "[committed via Kallithea] into repository" +msgid "[delete] repository" msgstr "" #: kallithea/lib/helpers.py:763 -msgid "[pulled from remote] into repository" +msgid "[created] user" msgstr "" #: kallithea/lib/helpers.py:765 -msgid "[pulled] from" +msgid "[updated] user" msgstr "" #: kallithea/lib/helpers.py:767 -msgid "[started following] repository" +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" +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" +msgstr "" + +#: kallithea/lib/helpers.py:781 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:783 +msgid "[pulled] from" +msgstr "" + +#: kallithea/lib/helpers.py:785 +msgid "[started following] repository" +msgstr "" + +#: kallithea/lib/helpers.py:787 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1088 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1092 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "" -#: kallithea/lib/helpers.py:1158 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1161 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1164 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1167 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1404 +#: kallithea/lib/helpers.py:1417 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1025,766 +1129,995 @@ "repositories" msgstr "" -#: kallithea/lib/unionrepo.py:193 -msgid "cannot create new union repository" -msgstr "" - -#: kallithea/lib/utils2.py:410 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:411 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:412 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:413 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:431 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:433 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/utils2.py:435 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/utils2.py:438 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/utils2.py:440 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/utils2.py:443 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:446 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: 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/model/db.py:1413 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: 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/model/db.py:1414 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: 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:1305 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 kallithea/model/db.py:1415 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 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_1_5_2.py:1306 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 kallithea/model/db.py:1416 -msgid "Repository admin access" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 kallithea/model/db.py:1662 +msgid "Repository read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no access" +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repositories Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repositories Group write access" +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_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 "Repositories 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 "Repositories Group admin access" +msgid "Repositories Group read access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: 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/model/db.py:1411 -msgid "Kallithea Administrator" +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 +msgid "Repositories Group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: 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/model/db.py:1434 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +msgid "Repositories Group admin access" +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:1430 kallithea/model/db.py:1435 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 +#: 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:1432 kallithea/model/db.py:1437 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: 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:1433 kallithea/model/db.py:1438 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_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 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 +#: 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 -msgid "Register new user with Kallithea with manual activation" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1643 -#: 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/model/db.py:1939 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1644 -#: 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/model/db.py:1940 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 kallithea/model/db.py:1941 -msgid "Rejected" -msgstr "" - #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py: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_1_5_2.py:1766 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 kallithea/model/db.py:1942 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 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 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 kallithea/model/db.py:1275 +#: 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 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/model/db.py:1418 -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/model/db.py:1419 -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/model/db.py:1420 -msgid "Repository group write access" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 kallithea/model/db.py:1666 +msgid "Repository group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 kallithea/model/db.py:1421 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 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_1_7_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 kallithea/model/db.py:1669 msgid "Repository group admin access" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 kallithea/model/db.py:1423 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 kallithea/model/db.py:1671 msgid "User group no access" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 kallithea/model/db.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 kallithea/model/db.py:1672 msgid "User group read access" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 kallithea/model/db.py:1425 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 msgid "User group write access" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 kallithea/model/db.py:1426 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 msgid "User group admin access" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 kallithea/model/db.py:1428 +#: 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 msgid "Repository Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 kallithea/model/db.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 msgid "Repository Group creation enabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 kallithea/model/db.py:1431 +#: 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 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 kallithea/model/db.py:1432 +#: 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 msgid "User Group creation enabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 kallithea/model/db.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 msgid "Registration disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 kallithea/model/db.py:1441 +#: 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:1437 kallithea/model/db.py:1442 +#: 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 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/model/comment.py:75 +#: 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 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "" -#: kallithea/model/forms.py:43 +#: kallithea/model/forms.py:57 msgid "Please enter a login" msgstr "" -#: kallithea/model/forms.py:44 +#: kallithea/model/forms.py:58 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:52 +#: kallithea/model/forms.py:66 msgid "Please enter a password" msgstr "" -#: kallithea/model/forms.py:53 +#: kallithea/model/forms.py:67 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/notification.py:228 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:229 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:230 -#, python-format -msgid "%(user)s mentioned you at %(when)s" +#: kallithea/model/forms.py:156 +msgid "Name must not contain only digits" msgstr "" #: kallithea/model/notification.py:231 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s commented on changeset at %(when)s" msgstr "" #: kallithea/model/notification.py:232 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:233 #, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:234 +#, python-format +msgid "%(user)s registered in Kallithea at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:235 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:236 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:98 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:674 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:232 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:257 kallithea/model/user.py:281 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:303 +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:309 +#: 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:334 +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:366 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:367 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "" -#: kallithea/model/validators.py:38 kallithea/model/validators.py:39 +#: kallithea/model/validators.py:82 kallithea/model/validators.py:83 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:85 +#: kallithea/model/validators.py:120 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:87 +#: kallithea/model/validators.py:122 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: kallithea/model/validators.py:89 +#: kallithea/model/validators.py:124 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:117 +#: kallithea/model/validators.py:151 +msgid "The input is not valid" +msgstr "" + +#: kallithea/model/validators.py:158 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:136 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:137 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:139 -msgid "" -"user group name may only contain alphanumeric characters underscores, " -"periods or dashes and must begin with alphanumeric character" -msgstr "" - #: kallithea/model/validators.py:177 -msgid "Cannot assign this group as parent" +msgid "Invalid user group name" msgstr "" #: kallithea/model/validators.py:178 #, python-format -msgid "Group \"%(group_name)s\" already exists" +msgid "User group \"%(usergroup)s\" already exists" msgstr "" #: kallithea/model/validators.py:180 +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 +msgid "Cannot assign this group as parent" +msgstr "" + +#: kallithea/model/validators.py:219 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:221 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:238 +#: kallithea/model/validators.py:279 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:253 +#: kallithea/model/validators.py:294 +msgid "Invalid old password" +msgstr "" + +#: kallithea/model/validators.py:310 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:270 +#: kallithea/model/validators.py:327 msgid "invalid password" msgstr "" -#: kallithea/model/validators.py:271 +#: kallithea/model/validators.py:328 msgid "invalid user name" msgstr "" -#: kallithea/model/validators.py:272 +#: kallithea/model/validators.py:329 msgid "Your account is disabled" msgstr "" -#: kallithea/model/validators.py:316 +#: kallithea/model/validators.py:373 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: kallithea/model/validators.py:318 +#: kallithea/model/validators.py:375 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:319 +#: kallithea/model/validators.py:376 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:321 +#: kallithea/model/validators.py:378 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:438 +#: kallithea/model/validators.py:493 msgid "invalid clone url" msgstr "" -#: kallithea/model/validators.py:439 +#: kallithea/model/validators.py:494 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: kallithea/model/validators.py:464 +#: kallithea/model/validators.py:519 msgid "Fork have to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:479 +#: kallithea/model/validators.py:534 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:481 +#: kallithea/model/validators.py:536 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:518 +#: kallithea/model/validators.py:585 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:559 +#: kallithea/model/validators.py:626 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:652 +#: kallithea/model/validators.py:719 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:667 +#: kallithea/model/validators.py:734 msgid "This e-mail address is already taken" msgstr "" -#: kallithea/model/validators.py:687 +#: kallithea/model/validators.py:754 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: kallithea/model/validators.py:724 +#: kallithea/model/validators.py:791 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:737 +#: kallithea/model/validators.py:804 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: kallithea/model/validators.py:769 +#: kallithea/model/validators.py:836 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: kallithea/model/validators.py:770 +#: kallithea/model/validators.py:837 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:803 +#: kallithea/model/validators.py:870 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:884 msgid "Filename cannot be inside a directory" msgstr "" +#: kallithea/model/validators.py:900 +#, 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "" #: kallithea/templates/index_base.html:6 -#: kallithea/templates/repo_switcher_list.html:4 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/users/user_edit_my_account.html:31 -#: 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:46 -#: kallithea/templates/journal/journal.html:47 -#: kallithea/templates/tags/tags.html:9 +#: 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/journal/journal.html:49 +#: kallithea/templates/journal/journal.html:50 +#: kallithea/templates/tags/tags.html:12 msgid "quick filter..." msgstr "" #: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" msgstr "" -#: kallithea/templates/index_base.html:13 -#: kallithea/templates/index_base.html:18 -#: kallithea/templates/admin/repos/repo_add.html:5 -#: kallithea/templates/admin/repos/repos.html:21 -msgid "Add repository" -msgstr "" - -#: kallithea/templates/index_base.html:15 #: kallithea/templates/index_base.html:20 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:31 -msgid "Add group" -msgstr "" - +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/admin/repos/repo_add.html:22 +#: kallithea/templates/admin/repos/repos.html:25 +msgid "Add Repository" +msgstr "" + +#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -msgid "Edit group" -msgstr "" - -#: 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 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:32 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:40 -#: kallithea/templates/admin/repos_groups/repos_groups_add.html:33 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:38 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:43 -#: kallithea/templates/admin/users_groups/users_group_add.html:32 -#: kallithea/templates/admin/users_groups/users_group_edit.html:33 -#: kallithea/templates/admin/users_groups/users_groups.html:37 -msgid "Group name" -msgstr "" - -#: kallithea/templates/index_base.html:41 -#: kallithea/templates/index_base.html:123 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit.html:68 -#: kallithea/templates/admin/repos/repos.html:73 -#: kallithea/templates/admin/repos_groups/repos_groups_add.html:42 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:47 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:44 -#: kallithea/templates/email_templates/changeset_comment.html:9 +#: kallithea/templates/index_base.html:32 +msgid "Edit Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:45 +msgid "Group Name" +msgstr "" + +#: kallithea/templates/index_base.html:46 +#: kallithea/templates/index_base.html:128 +#: 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_edit_settings.html:17 +#: kallithea/templates/admin/repo_groups/repo_groups.html:51 +#: 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/user_groups/user_group_edit_settings.html:15 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: 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:56 -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -#: kallithea/templates/summary/summary.html:106 +#: kallithea/templates/forks/fork.html:41 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 +#: kallithea/templates/summary/summary.html:88 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:51 -#: kallithea/templates/admin/permissions/permissions.html:55 -#: kallithea/templates/admin/repos/repo_add_base.html:29 -#: kallithea/templates/admin/repos/repo_edit.html:50 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:57 -#: kallithea/templates/forks/fork.html:47 -msgid "Repository group" -msgstr "" - -#: kallithea/templates/index_base.html:121 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit.html:32 -#: kallithea/templates/admin/repos/repos.html:71 -#: kallithea/templates/admin/users/user_edit_my_account.html:172 -#: kallithea/templates/base/perms_summary.html:37 -#: kallithea/templates/bookmarks/bookmarks.html:48 -#: kallithea/templates/bookmarks/bookmarks_data.html:6 -#: kallithea/templates/branches/branches.html:47 -#: kallithea/templates/branches/branches_data.html:6 -#: kallithea/templates/files/files_browser.html:47 -#: kallithea/templates/journal/journal.html:193 -#: kallithea/templates/journal/journal.html:283 -#: kallithea/templates/summary/summary.html:55 -#: kallithea/templates/summary/summary.html:124 -#: kallithea/templates/tags/tags.html:48 -#: kallithea/templates/tags/tags_data.html:6 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:124 -msgid "Last Change" -msgstr "" - #: kallithea/templates/index_base.html:126 -#: kallithea/templates/admin/repos/repos.html:74 -#: kallithea/templates/admin/users/user_edit_my_account.html:174 -#: kallithea/templates/journal/journal.html:195 -#: kallithea/templates/journal/journal.html:285 +#: 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 +msgid "Last Change" +msgstr "" + +#: kallithea/templates/index_base.html:131 +#: 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 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:128 -#: kallithea/templates/admin/repos/repo_edit.html:114 -#: kallithea/templates/admin/repos/repos.html:76 +#: kallithea/templates/index_base.html:133 +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/admin/repos/repos.html:53 +#: 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 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:136 -#: kallithea/templates/admin/repos/repos.html:84 -#: kallithea/templates/admin/users/user_edit_my_account.html:183 -#: kallithea/templates/admin/users/users.html:107 -#: kallithea/templates/bookmarks/bookmarks.html:74 -#: kallithea/templates/branches/branches.html:73 -#: kallithea/templates/journal/journal.html:204 -#: kallithea/templates/journal/journal.html:294 -#: kallithea/templates/tags/tags.html:74 +#: 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:137 -#: kallithea/templates/admin/repos/repos.html:85 -#: kallithea/templates/admin/users/user_edit_my_account.html:184 -#: kallithea/templates/admin/users/users.html:108 -#: kallithea/templates/bookmarks/bookmarks.html:75 -#: kallithea/templates/branches/branches.html:74 -#: kallithea/templates/journal/journal.html:205 -#: kallithea/templates/journal/journal.html:295 -#: kallithea/templates/tags/tags.html:75 +#: 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:138 +#: kallithea/templates/index_base.html:143 msgid "No repositories found." msgstr "" -#: kallithea/templates/index_base.html:139 -#: kallithea/templates/admin/repos/repos.html:87 -#: kallithea/templates/admin/users/user_edit_my_account.html:186 -#: kallithea/templates/admin/users/users.html:110 -#: kallithea/templates/bookmarks/bookmarks.html:77 -#: kallithea/templates/branches/branches.html:76 -#: kallithea/templates/journal/journal.html:207 -#: kallithea/templates/journal/journal.html:297 -#: kallithea/templates/tags/tags.html:77 +#: kallithea/templates/index_base.html:144 +#: kallithea/templates/admin/my_account/my_account_repos.html:60 +#: kallithea/templates/admin/my_account/my_account_watched.html:60 +#: kallithea/templates/base/root.html:70 +#: kallithea/templates/bookmarks/bookmarks.html:84 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:211 +#: kallithea/templates/journal/journal.html:302 +#: kallithea/templates/tags/tags.html:84 msgid "Data error." msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/repos/repos.html:88 -#: kallithea/templates/admin/users/user_edit_my_account.html:58 -#: kallithea/templates/admin/users/user_edit_my_account.html:187 -#: kallithea/templates/admin/users/users.html:111 -#: kallithea/templates/bookmarks/bookmarks.html:78 -#: kallithea/templates/branches/branches.html:77 -#: kallithea/templates/journal/journal.html:208 -#: kallithea/templates/journal/journal.html:298 -#: kallithea/templates/tags/tags.html:78 +#: kallithea/templates/index_base.html:145 +#: 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 msgid "Loading..." msgstr "" -#: kallithea/templates/login.html:5 kallithea/templates/base/base.html:239 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:32 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:21 +#: kallithea/templates/login.html:30 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:31 kallithea/templates/register.html:20 +#: kallithea/templates/login.html:43 kallithea/templates/register.html:40 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit.html:57 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:31 -#: kallithea/templates/admin/users/users.html:77 -#: kallithea/templates/base/base.html:215 -#: kallithea/templates/summary/summary.html:123 +#: kallithea/templates/admin/my_account/my_account_profile.html:30 +#: kallithea/templates/admin/users/user_add.html:35 +#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/base/base.html:246 msgid "Username" msgstr "" -#: kallithea/templates/login.html:40 kallithea/templates/register.html:29 -#: kallithea/templates/admin/ldap/ldap.html:46 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:224 +#: 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 msgid "Password" msgstr "" -#: kallithea/templates/login.html:50 +#: kallithea/templates/login.html:62 msgid "Remember me" msgstr "" -#: kallithea/templates/login.html:54 +#: kallithea/templates/login.html:66 msgid "Sign In" msgstr "" -#: kallithea/templates/login.html:60 +#: kallithea/templates/login.html:72 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:63 kallithea/templates/base/base.html:235 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "" @@ -1792,111 +2125,112 @@ msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:11 -msgid "Reset your password to" -msgstr "" - -#: kallithea/templates/password_reset.html:21 -msgid "Email address" -msgstr "" - -#: kallithea/templates/password_reset.html:30 -msgid "Reset my password" +#: 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 +msgid "Email Address" +msgstr "" + +#: kallithea/templates/password_reset.html:52 +#: kallithea/templates/register.html:95 +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 send to matching email address" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:74 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:30 +#: kallithea/templates/register.html:106 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:11 -msgid "Sign Up to" -msgstr "" - -#: kallithea/templates/register.html:38 +#: kallithea/templates/register.html:28 +#, python-format +msgid "Sign Up to %s" +msgstr "" + +#: kallithea/templates/register.html:58 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:47 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit.html:97 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:62 +#: 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/admin/users/user_edit_profile.html:87 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:56 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit.html:106 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:71 -msgid "Last Name" -msgstr "" - -#: kallithea/templates/register.html:65 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit.html:115 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:80 -#: kallithea/templates/summary/summary.html:125 -msgid "Email" -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/admin/users/user_edit_profile.html:96 +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/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:78 +#: kallithea/templates/register.html:110 msgid "Your account must wait for activation by administrator" msgstr "" -#: kallithea/templates/repo_switcher_list.html:10 -#: kallithea/templates/admin/defaults/defaults.html:44 -#: kallithea/templates/admin/repos/repo_add_base.html:65 -#: kallithea/templates/admin/repos/repo_edit.html:78 -#: kallithea/templates/data_table/_dt_elements.html:61 -#: kallithea/templates/summary/summary.html:77 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/repo_switcher_list.html:12 -#: kallithea/templates/data_table/_dt_elements.html:63 -#: kallithea/templates/summary/summary.html:79 -msgid "Public repository" -msgstr "" - #: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:57 +#: kallithea/templates/branches/branches_data.html:67 msgid "There are no branches yet" msgstr "" -#: kallithea/templates/switch_to_list.html:22 -#: kallithea/templates/tags/tags_data.html:38 +#: kallithea/templates/switch_to_list.html:16 +msgid "Closed Branches" +msgstr "" + +#: kallithea/templates/switch_to_list.html:32 +#: kallithea/templates/tags/tags_data.html:44 msgid "There are no tags yet" msgstr "" -#: kallithea/templates/switch_to_list.html:35 -#: kallithea/templates/bookmarks/bookmarks_data.html:37 +#: kallithea/templates/switch_to_list.html:45 +#: kallithea/templates/bookmarks/bookmarks_data.html:43 msgid "There are no bookmarks yet" msgstr "" #: kallithea/templates/admin/admin.html:5 -#: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:73 +#: kallithea/templates/admin/admin.html:16 +#: kallithea/templates/base/base.html:72 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 -#: kallithea/templates/journal/journal.html:12 +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" @@ -1904,28 +2238,30 @@ msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/repos/repos.html:77 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:46 -#: kallithea/templates/admin/users/user_edit_my_account.html:176 -#: kallithea/templates/admin/users/users.html:87 -#: kallithea/templates/admin/users_groups/users_groups.html:40 -#: kallithea/templates/journal/journal.html:197 -#: kallithea/templates/journal/journal.html:287 +#: 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/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 msgid "Action" msgstr "" #: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 msgid "Repository" msgstr "" #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:48 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 +#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks_data.html:9 +#: kallithea/templates/branches/branches.html:52 +#: kallithea/templates/branches/branches_data.html:9 +#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -1937,311 +2273,599 @@ msgid "No actions yet" msgstr "" +#: kallithea/templates/admin/auth/auth_settings.html:5 +msgid "Authentication Settings" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:14 +#: kallithea/templates/base/base.html:78 +msgid "Authentication" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:31 +msgid "Authentication Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:34 +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:36 +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 +msgid "enabled" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:43 +#: kallithea/templates/base/root.html:64 +msgid "disabled" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/defaults/defaults.html:87 +#: kallithea/templates/admin/my_account/my_account_password.html:33 +#: kallithea/templates/admin/my_account/my_account_profile.html:68 +#: 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_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_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/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:25 +#: kallithea/templates/admin/defaults/defaults.html:28 msgid "Repositories defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/defaults/defaults.html:14 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:35 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/defaults/defaults.html:38 +#: 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:48 -#: kallithea/templates/admin/repos/repo_add_base.html:69 -#: kallithea/templates/admin/repos/repo_edit.html:82 -#: kallithea/templates/forks/fork.html:69 +#: kallithea/templates/admin/defaults/defaults.html:47 +#: 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 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:51 +#: kallithea/templates/admin/repos/repo_add_base.html:81 +#: kallithea/templates/admin/repos/repo_edit_settings.html:86 +#: kallithea/templates/forks/fork.html:75 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:55 -#: kallithea/templates/admin/repos/repo_edit.html:87 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:91 msgid "Enable statistics" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:59 -#: kallithea/templates/admin/repos/repo_edit.html:91 +#: kallithea/templates/admin/defaults/defaults.html:62 +#: kallithea/templates/admin/repos/repo_edit_settings.html:95 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:65 -#: kallithea/templates/admin/repos/repo_edit.html:96 +#: kallithea/templates/admin/defaults/defaults.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 msgid "Enable downloads" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:69 -#: kallithea/templates/admin/repos/repo_edit.html:100 +#: kallithea/templates/admin/defaults/defaults.html:72 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:75 -#: kallithea/templates/admin/repos/repo_edit.html:105 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:64 +#: kallithea/templates/admin/defaults/defaults.html:78 +#: 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:79 -#: kallithea/templates/admin/repos/repo_edit.html:109 +#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/repos/repo_edit_settings.html:113 msgid "Enable lock-by-pulling on repository." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:84 -#: kallithea/templates/admin/ldap/ldap.html:89 -#: kallithea/templates/admin/permissions/permissions.html:122 -#: kallithea/templates/admin/repos/repo_edit.html:141 -#: kallithea/templates/admin/repos/repo_edit.html:166 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:72 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:96 -#: kallithea/templates/admin/settings/hooks.html:73 -#: kallithea/templates/admin/users/user_add.html:94 -#: kallithea/templates/admin/users/user_edit.html:140 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:88 -#: kallithea/templates/admin/users_groups/users_group_add.html:49 -#: kallithea/templates/admin/users_groups/users_group_edit.html:90 -#: kallithea/templates/admin/users_groups/users_group_edit.html:143 -#: kallithea/templates/base/default_perms_box.html:53 -msgid "Save" -msgstr "" - -#: kallithea/templates/admin/gists/index.html:5 -#: kallithea/templates/base/base.html:299 -msgid "Gists" +#: kallithea/templates/admin/gists/edit.html:5 +#: kallithea/templates/admin/gists/edit.html:22 +msgid "Edit Gist" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:40 +#, 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 +msgid "Gist description ..." +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 +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/my_account/my_account_api_keys.html:8 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 +#: kallithea/templates/admin/users/user_edit_api_keys.html:8 +#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +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 +msgid "Update Gist" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:148 +#: 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" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:8 +#: kallithea/templates/admin/gists/index.html:21 +#, python-format +msgid "Public Gists for user %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 -#, python-format -msgid "Private Gists for user %s" -msgstr "" - -#: kallithea/templates/admin/gists/index.html:12 -#, python-format -msgid "Public Gists for user %s" -msgstr "" - -#: kallithea/templates/admin/gists/index.html:14 +#: kallithea/templates/admin/gists/index.html:23 msgid "Public Gists" msgstr "" -#: kallithea/templates/admin/gists/index.html:31 -#: kallithea/templates/admin/gists/show.html:24 -#: kallithea/templates/base/base.html:302 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/admin/gists/index.html:48 +#: kallithea/templates/admin/gists/index.html:40 +#: kallithea/templates/admin/gists/show.html:28 +msgid "Create New Gist" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/data_table/_dt_elements.html:143 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:51 -#: kallithea/templates/admin/gists/index.html:53 -#: kallithea/templates/admin/gists/show.html:43 -#: kallithea/templates/admin/gists/show.html:45 -msgid "Expires" -msgstr "" - -#: kallithea/templates/admin/gists/index.html:51 -#: kallithea/templates/admin/gists/show.html:43 -msgid "never" -msgstr "" - -#: kallithea/templates/admin/gists/index.html:68 +#: kallithea/templates/admin/gists/index.html:77 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 -#: kallithea/templates/admin/gists/new.html:16 -msgid "New gist" -msgstr "" - -#: kallithea/templates/admin/gists/new.html:37 -msgid "Gist description ..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:52 -msgid "Create private gist" -msgstr "" - -#: kallithea/templates/admin/gists/new.html:53 -msgid "Create public gist" -msgstr "" - -#: kallithea/templates/admin/gists/new.html:54 -#: kallithea/templates/admin/permissions/permissions.html:123 -#: kallithea/templates/admin/permissions/permissions.html:185 -#: kallithea/templates/admin/repos/repo_edit.html:142 -#: kallithea/templates/admin/repos/repo_edit.html:167 -#: kallithea/templates/admin/repos/repo_edit.html:381 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:73 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:97 -#: kallithea/templates/admin/settings/settings.html:115 -#: kallithea/templates/admin/settings/settings.html:196 -#: kallithea/templates/admin/settings/settings.html:288 -#: kallithea/templates/admin/users/user_edit.html:141 -#: kallithea/templates/admin/users/user_edit.html:198 -#: kallithea/templates/admin/users/user_edit.html:246 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:89 -#: kallithea/templates/admin/users_groups/users_group_edit.html:144 -#: kallithea/templates/base/default_perms_box.html:54 -#: kallithea/templates/files/files_add.html:80 -#: kallithea/templates/files/files_edit.html:66 -#: kallithea/templates/pullrequests/pullrequest.html:86 +#: kallithea/templates/admin/gists/new.html:22 +msgid "New Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:51 +msgid "name this file..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:60 +msgid "Create Private Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:61 +msgid "Create Public Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:62 +#: 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/permissions/permissions_globals.html:109 +#: kallithea/templates/admin/permissions/permissions_ips.html:41 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:59 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:135 +#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_vcs.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: 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 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 -msgid "gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:9 +#: kallithea/templates/admin/gists/show.html:12 msgid "Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:36 -msgid "Public gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:38 -msgid "Private gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:54 -#: kallithea/templates/admin/repos/repo_edit.html:299 -#: kallithea/templates/changeset/changeset_file_comment.html:40 +#: 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 +msgid "URL" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:40 +msgid "Public Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:42 +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/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:54 +#: kallithea/templates/admin/gists/show.html:59 #, fuzzy -msgid "Confirm to delete this gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/admin/gists/show.html:84 -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:25 -#: kallithea/templates/files/files_source.html:55 -msgid "Show as raw" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:71 +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/data_table/_dt_elements.html:167 +#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:44 +msgid "Edit" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:68 +#: kallithea/templates/files/files_edit.html:54 +#: kallithea/templates/files/files_source.html:34 +msgid "Show as Raw" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:76 msgid "created" msgstr "" -#: kallithea/templates/admin/ldap/ldap.html:5 -msgid "LDAP administration" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:11 -#: kallithea/templates/admin/users/users.html:86 -#: kallithea/templates/base/base.html:79 -msgid "LDAP" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:28 -msgid "Connection settings" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:30 -msgid "Enable LDAP" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:34 -msgid "Host" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:38 -msgid "Port" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:42 -msgid "Account" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:50 -msgid "Connection security" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:54 -msgid "Certificate Checks" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:57 -msgid "Search settings" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:59 -msgid "Base DN" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:63 -msgid "LDAP Filter" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:67 -msgid "LDAP Search Scope" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:70 -msgid "Attribute mappings" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:72 -msgid "Login Attribute" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:76 -msgid "First Name Attribute" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:80 -msgid "Last Name Attribute" -msgstr "" - -#: kallithea/templates/admin/ldap/ldap.html:84 -msgid "E-mail Attribute" +#: kallithea/templates/admin/gists/show.html:89 +#: kallithea/templates/files/files_source.html:71 +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 +msgid "My Account" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/users/user_edit.html:42 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:40 +#: kallithea/templates/admin/users/user_edit.html:43 +msgid "API keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:41 +msgid "My Emails" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:42 +msgid "My Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:43 +#: kallithea/templates/journal/journal.html:54 +msgid "Watched" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:44 +msgid "Pull requests" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:45 +msgid "My permissions" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 +#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +msgid "Built-in" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 +#: kallithea/templates/admin/users/user_edit_api_keys.html:8 +#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +msgid "expires" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#, python-format +msgid "Confirm to reset this api key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 +#: kallithea/templates/admin/users/user_edit_api_keys.html:15 +msgid "reset" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 +#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +msgid "expired" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 +#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#, python-format +msgid "Confirm to remove this api key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 +#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +msgid "remove" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 +#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +msgid "No additional api keys specified" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +msgid "New api key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 +#: kallithea/templates/admin/my_account/my_account_emails.html:45 +#: kallithea/templates/admin/permissions/permissions_ips.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:85 +#: kallithea/templates/admin/repos/repo_edit_fields.html:58 +#: kallithea/templates/admin/users/user_edit_api_keys.html:69 +#: kallithea/templates/admin/users/user_edit_emails.html:45 +#: kallithea/templates/admin/users/user_edit_ips.html:49 +msgid "Add" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:7 +#: kallithea/templates/admin/users/user_edit_emails.html:7 +msgid "Primary" +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 +#: kallithea/templates/admin/users/user_edit_emails.html:19 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/data_table/_dt_elements.html:131 +#: kallithea/templates/data_table/_dt_elements.html:159 +#: kallithea/templates/data_table/_dt_elements.html:175 +#: kallithea/templates/data_table/_dt_elements.html:191 +msgid "delete" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:20 +#: kallithea/templates/admin/users/user_edit_emails.html:20 +#, python-format +msgid "Confirm to delete this email: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:26 +#: kallithea/templates/admin/users/user_edit_emails.html:26 +msgid "No additional emails specified" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:38 +#: kallithea/templates/admin/users/user_edit_emails.html:38 +msgid "New email address" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:1 +msgid "Change your account password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:7 +msgid "Current password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:16 +#: kallithea/templates/admin/users/user_edit_profile.html:69 +msgid "New password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:25 +msgid "Confirm new password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:9 +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." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/users/user_edit_profile.html:15 +msgid "current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:26 +msgid "" +"Your user is in an external Source of Record; some details cannot be " +"managed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:4 +msgid "Show closed pull requests" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:6 +msgid "Opened by me" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:15 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:17 +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:47 +#: kallithea/templates/pullrequests/pullrequest_data.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:30 +#: kallithea/templates/pullrequests/pullrequest_show.html:45 +msgid "Closed" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:25 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:32 +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:53 +msgid "Nothing here yet" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:36 +msgid "I participate in" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_pullrequests.html:44 +#: kallithea/templates/pullrequests/pullrequest_data.html:8 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:1 +msgid "Repositories you are owner of" +msgstr "" + +#: 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 +msgid "No records found." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_watched.html:1 +msgid "Repositories you are watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/templates/admin/notifications/notifications.html:12 msgid "My Notifications" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/templates/admin/notifications/notifications.html:32 msgid "All" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:33 #, fuzzy msgid "Comments" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:8 -msgid "Pull requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:35 +#: kallithea/templates/admin/notifications/notifications.html:34 +#: kallithea/templates/base/base.html:196 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications.html:38 msgid "Mark all read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:39 +#: kallithea/templates/admin/notifications/notifications_data.html:40 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/templates/admin/notifications/show_notification.html:14 msgid "Show notification" msgstr "" -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:253 +#: kallithea/templates/admin/notifications/show_notification.html:12 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "" @@ -2249,1299 +2873,1608 @@ msgid "Permissions administration" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/admin/repos/repo_edit.html:151 -#: kallithea/templates/admin/repos/repo_edit.html:158 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:81 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:88 -#: kallithea/templates/admin/users/user_edit.html:150 -#: kallithea/templates/admin/users_groups/users_group_edit.html:129 -#: kallithea/templates/admin/users_groups/users_group_edit.html:136 -#: kallithea/templates/base/base.html:78 +#: 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" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:24 -msgid "Default permissions" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:31 +#: kallithea/templates/admin/permissions/permissions.html:41 +#: kallithea/templates/admin/settings/settings.html:42 +msgid "Global" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:42 +msgid "IP whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:43 +msgid "Overview" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:7 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:49 +#: 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" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:50 -#: kallithea/templates/admin/permissions/permissions.html:63 -#: kallithea/templates/admin/permissions/permissions.html:77 +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:54 msgid "Overwrite existing settings" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:62 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: 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 +msgid "Repository group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:69 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 +#: kallithea/templates/data_table/_dt_elements.html:211 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:76 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:91 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 +msgid "Repository creation with group write access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:72 +msgid "" +"Write permission to repository groups allows creating repositories inside" +" that group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:99 +#: kallithea/templates/admin/permissions/permissions_globals.html:85 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:107 +#: kallithea/templates/admin/permissions/permissions_globals.html:93 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:115 +#: kallithea/templates/admin/permissions/permissions_globals.html:101 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:133 -msgid "Default User Permissions" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:144 -#: kallithea/templates/admin/users/user_edit.html:207 -msgid "Allowed IP addresses" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:158 -#: kallithea/templates/admin/repos/repo_edit.html:340 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:70 -#: kallithea/templates/admin/users/user_edit.html:175 -#: kallithea/templates/admin/users/user_edit.html:220 -#: kallithea/templates/admin/users_groups/users_groups.html:54 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:136 -msgid "delete" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions.html:159 -#: kallithea/templates/admin/users/user_edit.html:221 +#: kallithea/templates/admin/permissions/permissions_ips.html:1 +msgid "Default ip whitelist for all users" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:15 +#: kallithea/templates/admin/users/user_edit_ips.html:23 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:165 -#: kallithea/templates/admin/users/user_edit.html:227 +#: kallithea/templates/admin/permissions/permissions_ips.html:21 +#: kallithea/templates/admin/users/user_edit_ips.html:30 msgid "All IP addresses are allowed" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:176 -#: kallithea/templates/admin/users/user_edit.html:238 +#: kallithea/templates/admin/permissions/permissions_ips.html:32 +#: kallithea/templates/admin/users/user_edit_ips.html:42 msgid "New ip address" msgstr "" -#: kallithea/templates/admin/permissions/permissions.html:184 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit.html:380 -#: kallithea/templates/admin/users/user_edit.html:197 -#: kallithea/templates/admin/users/user_edit.html:245 -msgid "Add" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:12 -#: kallithea/templates/admin/repos/repo_add.html:16 -#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:88 -#: kallithea/templates/base/base.html:116 -#: kallithea/templates/base/base.html:275 -msgid "Repositories" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add.html:19 +#: 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 +#: 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_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_edit_settings.html:26 +msgid "Group parent" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:63 +#: 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/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 "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 +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 +msgid "Advanced" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:1 +#, python-format +msgid "Repository Group: %s" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:6 +msgid "Top level repositories" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:7 +msgid "Total repositories" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:8 +msgid "Children groups" +msgstr "" + +#: 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 +msgid "Created on" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 +#: kallithea/templates/data_table/_dt_elements.html:192 +#, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:25 +#, fuzzy +msgid "Delete this repository group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/base/perms_summary.html:14 +msgid "none" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "read" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "write" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 +#: kallithea/templates/base/perms_summary.html:17 +msgid "admin" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +msgid "user/user group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +msgid "default" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +msgid "revoke" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +msgid "delegated admin" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:20 -#: kallithea/templates/summary/summary.html:96 -#: kallithea/templates/summary/summary.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +msgid "apply to children" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +msgid "Both" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +msgid "" +"Set or revoke permission to all children of that group, including non-" +"private repositories and other groups if selected." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_show.html:4 +#, fuzzy, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_show.html:12 +msgid "Home" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_show.html:16 +msgid "with" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:5 +msgid "Repository groups administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:13 +msgid "repository groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:52 +msgid "Number of toplevel repositories" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add.html:5 +msgid "Add repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:14 +msgid "Import existing repository ?" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:23 +#: kallithea/templates/summary/summary.html:32 msgid "Clone from" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit.html:45 +#: kallithea/templates/admin/repos/repo_add_base.html:27 msgid "Optional http[s] url from which repository should be cloned." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:33 -#: kallithea/templates/forks/fork.html:51 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/forks/fork.html:45 +msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/templates/forks/fork.html:55 msgid "Optionaly select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:63 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:47 -#: kallithea/templates/admin/repos/repo_edit.html:59 -#: kallithea/templates/forks/fork.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:51 +#: kallithea/templates/forks/fork.html:61 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:51 -#: kallithea/templates/admin/repos/repo_edit.html:63 -#: kallithea/templates/forks/fork.html:42 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:60 -#: kallithea/templates/admin/repos/repo_edit.html:72 -#: kallithea/templates/forks/fork.html:60 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/admin/repos/repo_add_base.html:72 +msgid "" +"Default revision for files page, downloads, full text search index and " +"readme generation" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:9 +#, python-format +msgid "%s Creating repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:16 +msgid "Creating repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:30 +#, python-format +msgid "" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:42 +msgid "" +"We're sorry but error occured during this operation. Please check your " +"Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -msgid "Edit repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/settings/hooks.html:9 -#: kallithea/templates/admin/settings/settings.html:11 -#: kallithea/templates/base/base.html:81 kallithea/templates/base/base.html:134 -#: kallithea/templates/summary/summary.html:212 -msgid "Settings" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:36 -msgid "Non-changeable id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:41 -msgid "Clone uri" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:54 -msgid "Optional select a group to put this repository into." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:119 -msgid "Change owner of this repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:177 -msgid "Advanced settings" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:180 -msgid "Statistics" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:184 -msgid "Reset current statistics" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:184 -msgid "Confirm to remove current statistics" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:187 -msgid "Fetched to rev" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:188 -msgid "Stats gathered" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:196 +#, fuzzy, python-format +msgid "%s repository settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:52 +msgid "Extra fields" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:55 +msgid "Caches" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:58 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:200 -msgid "Pull changes from remote location" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:200 -msgid "Confirm to pull changes from remote side" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:211 -msgid "Cache" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:215 -msgid "Invalidate repository cache" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:215 -msgid "Confirm to invalidate repository cache" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:218 -msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:223 -msgid "List of cached values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:226 -msgid "Prefix" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:227 -msgid "Key" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:228 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit.html:124 -#: kallithea/templates/admin/users/users.html:84 -#: kallithea/templates/admin/users_groups/users_group_add.html:41 -#: kallithea/templates/admin/users_groups/users_group_edit.html:42 -#: kallithea/templates/admin/users_groups/users_groups.html:39 -msgid "Active" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:243 -#: kallithea/templates/base/base.html:292 -#: kallithea/templates/base/base.html:293 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:249 +#: 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 +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 +#: 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_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 "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:251 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "Add to public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:256 +#: 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.html:263 -msgid "Locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:268 -msgid "Unlock locked repo" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:268 +#: 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.html:271 -msgid "Lock repo" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:271 +#: 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.html:272 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:66 +msgid "Lock repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:277 -msgid "Force locking on repository. Works only when anonymous access is disabled" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:284 -msgid "Set as fork of" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:289 -msgid "Set" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:293 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:308 -msgid "Remove this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:308 -msgid "Confirm to delete this repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:310 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:73 +msgid "" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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/data_table/_dt_elements.html:132 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#, fuzzy +msgid "Delete this repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 #, python-format msgid "this repository has %s fork" msgid_plural "this repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit.html:311 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:89 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:312 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:315 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for Kallithea and VCS systems. If you need to fully delete it" " from file system please do it manually" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:329 -msgid "Extra fields" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:341 +#: kallithea/templates/admin/repos/repo_edit_caches.html:4 +msgid "Invalidate repository cache" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:4 +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" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +msgid "List of cached values" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +msgid "Prefix" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:16 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +msgid "Key" +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_edit_settings.html:24 +#: kallithea/templates/admin/user_groups/user_groups.html:53 +#: kallithea/templates/admin/users/user_add.html:91 +#: kallithea/templates/admin/users/user_edit_profile.html:105 +#: kallithea/templates/admin/users/users.html:57 +msgid "Active" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +msgid "Label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 #, fuzzy, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:355 +#: kallithea/templates/admin/repos/repo_edit_fields.html:33 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:363 +#: kallithea/templates/admin/repos/repo_edit_fields.html:41 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:366 +#: kallithea/templates/admin/repos/repo_edit_fields.html:44 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:372 +#: kallithea/templates/admin/repos/repo_edit_fields.html:50 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:375 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_perms.html:3 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:3 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:3 -msgid "none" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_perms.html:4 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:4 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:4 -msgid "read" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_perms.html:5 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:5 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:5 -msgid "write" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_perms.html:6 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:6 -msgid "admin" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_perms.html:7 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:7 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:7 -msgid "member" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_perms.html:16 +#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +msgid "Extra fields are disabled" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "private repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_perms.html:19 -#: kallithea/templates/admin/repos/repo_edit_perms.html:28 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:20 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:35 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:20 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:35 -msgid "default" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_perms.html:33 -#: kallithea/templates/admin/repos/repo_edit_perms.html:58 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:25 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:55 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:25 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:55 -msgid "revoke" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_perms.html:83 -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:81 -#: kallithea/templates/admin/users_groups/user_group_edit_perms.html:81 -msgid "Add another member" +#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +msgid "Remote url" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:8 +msgid "Pull changes from remote location" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:8 +msgid "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" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +msgid "Non-changeable id" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +msgid "what is that ?" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +msgid "URL by id" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +msgid "" +"In case this repository is renamed or moved into another group the " +"repository url changes.\n" +" Using above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull for CI systems, or any other cases" +" that you need to hardcode the url into 3rd party service." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +msgid "Clone uri" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:27 +#: kallithea/templates/base/perms_summary.html:43 +#: kallithea/templates/base/perms_summary.html:79 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/data_table/_dt_elements.html:124 +#: kallithea/templates/data_table/_dt_elements.html:125 +#: kallithea/templates/data_table/_dt_elements.html:152 +#: kallithea/templates/data_table/_dt_elements.html:153 +#: kallithea/templates/data_table/_dt_elements.html:169 +#: kallithea/templates/data_table/_dt_elements.html:185 +msgid "edit" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:30 +msgid "new value" +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 "Optional select a group to put this repository into." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:65 +msgid "Default revision for files page, downloads, whoosh and readme" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +msgid "Change owner of this repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +msgid "Processed commits" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +msgid "Processed progress" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:10 +msgid "Reset statistics" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:10 +msgid "Confirm to remove current statistics" msgstr "" #: kallithea/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:86 -#: kallithea/templates/admin/users/user_edit_my_account.html:185 -#: kallithea/templates/admin/users/users.html:109 -#: kallithea/templates/bookmarks/bookmarks.html:76 -#: kallithea/templates/branches/branches.html:75 -#: kallithea/templates/journal/journal.html:206 -#: kallithea/templates/journal/journal.html:296 -#: kallithea/templates/tags/tags.html:76 -msgid "No records found." -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:87 -msgid "apply to children" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_group_edit_perms.html:88 -msgid "" -"Set or revoke permission to all children of that group, including non-" -"private repositories and other groups" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups.html:4 -#, python-format -msgid "%s Group Dashboard" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups.html:13 -msgid "with" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repository group" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_add.html:11 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:11 -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:16 -#: kallithea/templates/base/base.html:75 kallithea/templates/base/base.html:91 -msgid "Repository groups" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_add.html:13 -msgid "Add new repository group" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_add.html:51 -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:56 -msgid "Group parent" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_add.html:59 -msgid "save" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repository group" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:13 -#, python-format -msgid "Edit repository group %s" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:27 -msgid "Add child group" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_edit.html:68 -msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repository groups administration" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:45 -msgid "Number of toplevel repositories" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:64 -#: kallithea/templates/admin/users_groups/users_groups.html:48 -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:171 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:65 -#: kallithea/templates/admin/users_groups/users_groups.html:49 -#: kallithea/templates/base/perms_summary.html:29 -#: kallithea/templates/base/perms_summary.html:60 -#: kallithea/templates/base/perms_summary.html:62 -#: kallithea/templates/data_table/_dt_elements.html:116 -#: kallithea/templates/data_table/_dt_elements.html:117 -#: kallithea/templates/data_table/_dt_elements.html:130 -#: kallithea/templates/data_table/_dt_elements.html:131 -msgid "edit" -msgstr "" - -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:70 -#, python-format -msgid "Confirm to delete this group: %s with %s repository" -msgid_plural "Confirm to delete this group: %s with %s repositories" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/admin/repos_groups/repos_groups_show.html:78 -msgid "There are no repository groups yet" -msgstr "" - -#: kallithea/templates/admin/settings/hooks.html:5 +#: kallithea/templates/admin/repos/repos.html:54 +msgid "State" +msgstr "" + #: kallithea/templates/admin/settings/settings.html:5 msgid "Settings administration" msgstr "" -#: kallithea/templates/admin/settings/hooks.html:24 -msgid "Built in hooks - read only" -msgstr "" - -#: kallithea/templates/admin/settings/hooks.html:40 -msgid "Custom hooks" -msgstr "" - -#: kallithea/templates/admin/settings/hooks.html:56 -msgid "remove" -msgstr "" - -#: kallithea/templates/admin/settings/hooks.html:88 -msgid "Failed to remove hook" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:26 -msgid "Remap and rescan repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:34 -msgid "Rescan option" -msgstr "" - #: kallithea/templates/admin/settings/settings.html:40 -msgid "" -"In case a repository was deleted from filesystem and there are leftovers " -"in the database check this option to scan obsolete data in database and " -"remove it." +msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:41 -msgid "Destroy old data" +msgid "Remap and rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:43 -msgid "" -"Rescan repositories location for new repositories. Also deletes obsolete " -"if `destroy` flag is checked " -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:48 -msgid "Rescan repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:54 -msgid "Whoosh indexing" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:62 -msgid "Index build option" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:67 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:73 -msgid "Reindex" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:79 -msgid "Global application settings" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:88 +msgid "Visual" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:45 +#: 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 +msgid "System Info" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:4 +msgid "Email prefix" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:5 +msgid "Kallithea email from" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:6 +msgid "Error email from" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:7 +msgid "Error email recipients" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:9 +msgid "SMTP server" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:10 +msgid "SMTP username" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:11 +msgid "SMTP password" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:12 +msgid "SMTP port" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:14 +msgid "SMTP use TLS" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:15 +msgid "SMTP use SSL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:16 +#, fuzzy +msgid "SMTP auth" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:31 +msgid "Send test email to" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:39 +msgid "Send" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:8 msgid "Site branding" msgstr "" -#: kallithea/templates/admin/settings/settings.html:97 +#: kallithea/templates/admin/settings/settings_global.html:12 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings.html:106 +#: kallithea/templates/admin/settings/settings_global.html:27 msgid "Google Analytics code" msgstr "" -#: kallithea/templates/admin/settings/settings.html:114 -#: kallithea/templates/admin/settings/settings.html:195 -#: kallithea/templates/admin/settings/settings.html:287 +#: kallithea/templates/admin/settings/settings_global.html:36 +msgid "ReCaptcha public key" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:40 +msgid "Public key for reCaptcha system." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:46 +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_vcs.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" msgstr "" -#: kallithea/templates/admin/settings/settings.html:121 -msgid "Visualisation settings" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:129 -msgid "General" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:134 -msgid "Use repository extra fields" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:136 -msgid "Allows storing additional customized fields per repository." -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:139 -msgid "Show Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:141 -msgid "Shows or hides displayed version of Kallithea in the footer" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:146 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:150 +#: kallithea/templates/admin/settings/settings_hooks.html:1 +msgid "Built in Mercurial hooks - read only" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:15 +msgid "" +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:19 +msgid "Custom hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:69 +msgid "Failed to remove hook" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:6 +msgid "Rescan option" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:11 +msgid "Destroy old data" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"Number of items displayed in lightweight dashboard before pagination is " -"shown." -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:155 -msgid "Icons" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:160 -msgid "Show public repo icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:164 -msgid "Show private repo icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:166 -msgid "Show public/private icons next to repositories names" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:172 -msgid "Meta-Tagging" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:177 -msgid "Stylify recognised metatags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:204 -msgid "VCS settings" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:213 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:218 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:220 +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:17 +msgid "Invalidate cache for all repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:19 +msgid "" +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:23 +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" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 +msgid "Rescan Repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:7 +msgid "Index build option" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:12 +msgid "Build from scratch" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" -"Kallithea will require SSL for pushing or pulling. If SSL is missing it " -"will return HTTP Error 406: Not Acceptable" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:226 -msgid "Hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:231 -msgid "Update repository after push (hg update)" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:235 +"This option completely reindex all the files within Kallithea for proper " +"fulltext search capabilities." +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:21 +msgid "Reindex" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 +msgid "check for updates" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:5 +msgid "Python version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:6 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +msgid "GIT version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:8 +msgid "GIT path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Note: please make sure this server can access this url" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:14 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:22 +msgid "Python packages" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:6 +msgid "Web" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:11 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:13 +msgid "" +"Activate to set Kallithea to require SSL for pushing or pulling. If SSL " +"certificate is missing it will return a HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:24 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings.html:239 +#: kallithea/templates/admin/settings/settings_vcs.html:28 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings.html:243 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings.html:247 -msgid "Advanced setup" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:252 +#: kallithea/templates/admin/settings/settings_vcs.html:36 +msgid "Update repository after push (hg update)" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:42 msgid "Mercurial Extensions" msgstr "" -#: kallithea/templates/admin/settings/settings.html:257 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings.html:261 +#: kallithea/templates/admin/settings/settings_vcs.html:51 msgid "Enable hgsubversion extension" msgstr "" -#: kallithea/templates/admin/settings/settings.html:263 +#: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" -"Requires hgsubversion library installed. Allows cloning from svn remote " -"locations" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:274 +"Requires hgsubversion library to be installed. Allows cloning remote SVN " +"repositories and migrates them to Mercurial type." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "Repositories location" msgstr "" -#: kallithea/templates/admin/settings/settings.html:279 +#: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings.html:280 -#: kallithea/templates/base/base.html:143 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:282 +#: 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." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:8 +msgid "General" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:13 +msgid "Use repository extra fields" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:15 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:18 +msgid "Show Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:20 +msgid "Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:24 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Gravatar url allows you to use other avatar server application.\n" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:42 +msgid "" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Dashboard items" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:58 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:64 +msgid "Admin pages items" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" -"Location where repositories are stored. After changing this value a " -"restart, and rescan is required" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:303 -msgid "Test Email" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:311 -msgid "Email to" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:319 -msgid "Send" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:325 -msgid "System Info and Packages" -msgstr "" - -#: kallithea/templates/admin/settings/settings.html:328 -#: kallithea/templates/changelog/changelog.html:51 -msgid "Show" +"Number of items displayed in the admin pages grids before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:74 +msgid "Icons" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:79 +msgid "Show public repo icon on repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:83 +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 +msgid "Meta-Tagging" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:96 +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." +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 +msgid "Add User Group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +msgid "Short, optional description for this user group." +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#, python-format +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 +msgid "Default permissions" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit.html:46 +#: 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 +msgid "Members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:1 +#, python-format +msgid "User Group: %s" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 +#: kallithea/templates/data_table/_dt_elements.html:176 +#, fuzzy, python-format +msgid "Confirm to delete this user group: %s" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:21 +msgid "Delete this user group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:15 +msgid "No members yet" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +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 +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" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 msgid "Add user" msgstr "" -#: kallithea/templates/admin/users/user_add.html:10 -#: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/admin/users/user_add.html:13 +#: kallithea/templates/admin/users/user_edit.html:14 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "" -#: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:23 -msgid "Add new user" -msgstr "" - -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:15 +#: kallithea/templates/admin/users/users.html:27 +msgid "Add User" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:53 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 -msgid "Edit user" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:13 -#: kallithea/templates/admin/users_groups/users_group_edit.html:13 +#, python-format +msgid "%s user settings" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:46 +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 "Edit %s" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:34 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:10 -msgid "Change your avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:35 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:11 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:43 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:20 -msgid "API key" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:50 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:25 -msgid "Current IP" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:70 -msgid "LDAP DN" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:79 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:44 -msgid "New password" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:88 -#: kallithea/templates/admin/users/user_edit_my_account_form.html:53 -msgid "New password confirmation" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:163 -msgid "Email addresses" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:176 +msgid "User: %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:7 +#: kallithea/templates/admin/users/user_edit_profile.html:51 +msgid "Source of Record" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:9 +msgid "Last Login" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:10 +msgid "Member of User groups" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:21 +#: kallithea/templates/data_table/_dt_elements.html:160 #, python-format -msgid "Confirm to delete this email: %s" -msgstr "" - -#: kallithea/templates/admin/users/user_edit.html:190 -msgid "New email address" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account.html:5 -#: kallithea/templates/base/base.html:254 -msgid "My account" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account.html:9 -msgid "My Account" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account.html:35 -msgid "My permissions" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account.html:38 -#: kallithea/templates/journal/journal.html:54 -msgid "My repos" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account.html:41 -msgid "My pull requests" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:2 -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:4 -msgid "Show closed pull requests" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:6 -msgid "Opened by me" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:15 +msgid "Confirm to delete this user: %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:23 +msgid "Delete this user" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_ips.html:8 #, python-format -msgid "Pull request #%s opened on %s" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:17 -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:45 -#: kallithea/templates/pullrequests/pullrequest_data.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:27 -#: kallithea/templates/pullrequests/pullrequest_show.html:42 -msgid "Closed" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:23 -msgid "Confirm to delete this pull request" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:30 -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:51 -msgid "Nothing here yet" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:34 -msgid "I participate in" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: kallithea/templates/pullrequests/pullrequest_data.html:8 +msgid "Inherited from %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:8 +msgid "Change avatar at" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:12 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format -msgid "Pull request #%s opened by %s on %s" +msgid "" +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:60 +msgid "Name in Source of Record" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:78 +msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 msgid "Users administration" msgstr "" -#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:13 msgid "users" msgstr "" -#: kallithea/templates/admin/users/users.html:80 +#: kallithea/templates/admin/users/users.html:54 msgid "Firstname" msgstr "" -#: kallithea/templates/admin/users/users.html:81 +#: kallithea/templates/admin/users/users.html:55 msgid "Lastname" msgstr "" -#: kallithea/templates/admin/users/users.html:82 +#: kallithea/templates/admin/users/users.html:56 msgid "Last login" msgstr "" -#: kallithea/templates/admin/users_groups/users_group_add.html:5 -msgid "Add user group" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_add.html:10 -#: kallithea/templates/admin/users_groups/users_groups.html:11 -#: kallithea/templates/base/base.html:77 kallithea/templates/base/base.html:94 -msgid "User groups" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_add.html:12 -#: kallithea/templates/admin/users_groups/users_groups.html:26 -msgid "Add new user group" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit user group" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:11 -msgid "UserGroups" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:50 -#: kallithea/templates/admin/users_groups/users_groups.html:38 -msgid "Members" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:58 -msgid "Chosen group members" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:61 -msgid "Remove all elements" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:75 -msgid "Available members" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:79 -msgid "Add all elements" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:109 -msgid "No members yet" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_group_edit.html:117 -msgid "Global Permissions" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_groups.html:5 -msgid "User groups administration" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_groups.html:55 -#, fuzzy, python-format -msgid "Confirm to delete this user group: %s" -msgstr "" - -#: kallithea/templates/admin/users_groups/users_groups.html:62 -msgid "There are no user groups yet" -msgstr "" - -#: kallithea/templates/base/base.html:42 +#: kallithea/templates/admin/users/users.html:59 +msgid "Auth type" +msgstr "" + +#: kallithea/templates/base/base.html:37 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:52 -msgid "Report a bug" -msgstr "" - -#: kallithea/templates/base/base.html:121 -#: kallithea/templates/data_table/_dt_elements.html:9 -#: kallithea/templates/data_table/_dt_elements.html:11 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/summary/summary.html:8 -msgid "Summary" -msgstr "" - -#: kallithea/templates/base/base.html:122 -#: kallithea/templates/changelog/changelog.html:15 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/data_table/_dt_elements.html:19 -#: kallithea/templates/data_table/_dt_elements.html:21 -msgid "Changelog" -msgstr "" - -#: kallithea/templates/base/base.html:123 -#: kallithea/templates/data_table/_dt_elements.html:25 -#: kallithea/templates/data_table/_dt_elements.html:27 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/files/files.html:12 -msgid "Files" -msgstr "" - -#: kallithea/templates/base/base.html:125 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:127 -#: kallithea/templates/base/base.html:279 -msgid "loading..." -msgstr "" - -#: kallithea/templates/base/base.html:131 -msgid "Options" -msgstr "" - -#: kallithea/templates/base/base.html:137 -#: kallithea/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "" - -#: kallithea/templates/base/base.html:139 -#: kallithea/templates/base/base.html:312 -#: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 -msgid "Search" +#: kallithea/templates/base/base.html:49 +msgid "Support" +msgstr "" + +#: kallithea/templates/base/base.html:134 +msgid "Create fork" msgstr "" #: kallithea/templates/base/base.html:145 +#: kallithea/templates/data_table/_dt_elements.html:11 +#: kallithea/templates/data_table/_dt_elements.html:15 +#: kallithea/templates/summary/summary.html:11 +msgid "Summary" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/changelog/changelog.html:17 +#: 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/data_table/_dt_elements.html:27 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/templates/files/files.html:15 +msgid "Files" +msgstr "" + +#: kallithea/templates/base/base.html:149 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 +msgid "Options" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/templates/forks/forks_data.html:21 +msgid "Compare fork" +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" +msgstr "" + +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:153 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:154 +#: kallithea/templates/base/base.html:185 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:74 -#: kallithea/templates/forks/fork.html:9 +#: kallithea/templates/data_table/_dt_elements.html:39 +#: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:165 -msgid "Show Pull Requests" -msgstr "" - -#: kallithea/templates/base/base.html:165 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/base/base.html:202 +#: kallithea/templates/base/base.html:196 +#, 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:209 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "" -#: kallithea/templates/base/base.html:232 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:255 -msgid "Log Out" -msgstr "" - -#: kallithea/templates/base/base.html:274 -msgid "Switch repository" -msgstr "" - #: kallithea/templates/base/base.html:286 -msgid "Show recent activity" -msgstr "" - -#: kallithea/templates/base/base.html:287 -#: kallithea/templates/journal/journal.html:4 -msgid "Journal" -msgstr "" - -#: kallithea/templates/base/base.html:298 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:303 -msgid "All public gists" -msgstr "" - -#: kallithea/templates/base/base.html:305 -msgid "My public gists" -msgstr "" - -#: kallithea/templates/base/base.html:306 -msgid "My private gists" +msgid "Log Out" msgstr "" #: kallithea/templates/base/base.html:311 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:312 +#: kallithea/templates/journal/journal.html:4 +msgid "Journal" +msgstr "" + +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:323 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:324 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:327 +msgid "Create new gist" +msgstr "" + +#: kallithea/templates/base/base.html:328 +msgid "All public gists" +msgstr "" + +#: kallithea/templates/base/base.html:330 +msgid "My public gists" +msgstr "" + +#: kallithea/templates/base/base.html:331 +msgid "My private gists" +msgstr "" + +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "" +#: kallithea/templates/base/base.html:399 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:527 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/templates/base/base.html:536 +msgid "Site-wide shortcuts" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:14 -msgid "Inherit default permissions" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:18 +msgid "Inherit from defaults" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not apply." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:26 +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:28 msgid "Create repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:30 +#: kallithea/templates/base/default_perms_box.html:33 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:35 +#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:39 +#: kallithea/templates/base/default_perms_box.html:45 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:44 +#: kallithea/templates/base/default_perms_box.html:52 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:48 +#: kallithea/templates/base/default_perms_box.html:57 msgid "Select this option to allow repository forking for this user" msgstr "" -#: kallithea/templates/base/perms_summary.html:11 +#: kallithea/templates/base/perms_summary.html:13 +msgid "show" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:22 msgid "No permissions defined yet" msgstr "" -#: kallithea/templates/base/perms_summary.html:19 -#: kallithea/templates/base/perms_summary.html:38 +#: kallithea/templates/base/perms_summary.html:30 +#: kallithea/templates/base/perms_summary.html:54 msgid "Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:20 -#: kallithea/templates/base/perms_summary.html:39 +#: kallithea/templates/base/perms_summary.html:32 +#: kallithea/templates/base/perms_summary.html:56 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/root.html:43 -#, fuzzy -msgid "Add another comment" -msgstr "" - -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/data_table/_dt_elements.html:147 -msgid "Stop following this repository" +#: kallithea/templates/base/perms_summary.html:90 +msgid "No permission defined" msgstr "" #: kallithea/templates/base/root.html:45 -msgid "Start following this repository" +#, fuzzy +msgid "Add another comment" msgstr "" #: kallithea/templates/base/root.html:46 -msgid "Group" +#: kallithea/templates/data_table/_dt_elements.html:216 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:47 -msgid "members" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:48 -#: kallithea/templates/pullrequests/pullrequest.html:203 -msgid "Loading ..." +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:49 -msgid "Search truncated" +msgid "members" msgstr "" #: kallithea/templates/base/root.html:50 -msgid "No matching files" +#: kallithea/templates/pullrequests/pullrequest.html:202 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:51 -#: kallithea/templates/changelog/changelog.html:45 -msgid "Open new pull request" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:52 -msgid "Open new pull request for selected changesets" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:53 -msgid "Show selected changesets __S -> __E" +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:54 -msgid "Show selected changeset __S" +#: 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 "Selection link" +msgid "Open new pull request for selected changesets" msgstr "" #: kallithea/templates/base/root.html:56 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +msgid "Show selected changesets __S -> __E" msgstr "" #: kallithea/templates/base/root.html:57 -msgid "Expand diff" +msgid "Show selected changeset __S" msgstr "" #: kallithea/templates/base/root.html:58 -msgid "Failed to remoke permission" +msgid "Selection link" +msgstr "" + +#: kallithea/templates/base/root.html:59 +#: 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 "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:62 +msgid "confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:66 +msgid "specify changeset" msgstr "" #: kallithea/templates/bookmarks/bookmarks.html:5 @@ -3549,46 +4482,37 @@ msgid "%s Bookmarks" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:8 -#: kallithea/templates/branches/branches.html:50 -#: kallithea/templates/branches/branches_data.html:8 +#: kallithea/templates/bookmarks/bookmarks.html:29 +msgid "Compare Bookmarks" +msgstr "" + +#: kallithea/templates/bookmarks/bookmarks.html:55 +#: kallithea/templates/bookmarks/bookmarks_data.html:10 +#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches_data.html:10 #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:8 +#: kallithea/templates/tags/tags.html:55 +#: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:52 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:12 +#: kallithea/templates/branches/branches.html:55 +#: kallithea/templates/branches/branches_data.html:12 #: kallithea/templates/changelog/changelog_summary_data.html:5 -#: kallithea/templates/tags/tags.html:52 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Compare" -msgstr "" - #: kallithea/templates/branches/branches.html:5 #, python-format msgid "%s Branches" msgstr "" -#: kallithea/templates/branches/branches.html:26 -msgid "Compare branches" +#: kallithea/templates/branches/branches.html:29 +msgid "Compare Branches" msgstr "" #: kallithea/templates/changelog/changelog.html:6 @@ -3596,95 +4520,112 @@ msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:19 +#: kallithea/templates/changelog/changelog.html:21 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/templates/changelog/changelog.html:43 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:47 #: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:42 -msgid "Compare fork with parent" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:78 -#: kallithea/templates/changelog/changelog_summary_data.html:28 +#: 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 #, python-format -msgid "Click to open associated pull request #%s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:102 -#: kallithea/templates/summary/summary.html:403 -msgid "Show more" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 +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 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:105 +#: kallithea/templates/compare/compare_cs.html:36 +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:107 -#: kallithea/templates/changeset/changeset_range.html:86 +#: kallithea/templates/changeset/changeset.html:93 +#: kallithea/templates/changeset/changeset_range.html:93 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:121 +#: kallithea/templates/changelog/changelog.html:130 #: kallithea/templates/changelog/changelog_summary_data.html:56 -#: kallithea/templates/changeset/changeset.html:113 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/changeset_range.html:99 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:126 +#: kallithea/templates/changelog/changelog.html:135 #: kallithea/templates/changelog/changelog_summary_data.html:61 -#: kallithea/templates/changeset/changeset.html:117 -#: kallithea/templates/changeset/changeset_range.html:96 +#: kallithea/templates/changeset/changeset.html:105 +#: kallithea/templates/changeset/changeset_range.html:103 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:286 +#: kallithea/templates/changelog/changelog.html:299 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:91 +#: kallithea/templates/changeset/changeset.html:76 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:92 +#: kallithea/templates/changeset/changeset.html:77 #, fuzzy msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:93 +#: kallithea/templates/changeset/changeset.html:78 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:95 -#: kallithea/templates/changeset/changeset.html:96 -#: kallithea/templates/changeset/changeset.html:97 +#: kallithea/templates/changeset/changeset.html:80 +#: kallithea/templates/changeset/changeset.html:81 +#: kallithea/templates/changeset/changeset.html:82 #, python-format msgid "Affected %s files" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:6 -#: kallithea/templates/files/files_add.html:75 -#: kallithea/templates/files/files_edit.html:61 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:53 msgid "Commit message" msgstr "" @@ -3701,9 +4642,8 @@ msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:89 -#: kallithea/templates/files/files_add.html:38 -#: kallithea/templates/files/files_browser.html:31 -msgid "Add new file" +#: kallithea/templates/files/files_ypjax.html:9 +msgid "Add New File" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:95 @@ -3719,158 +4659,173 @@ msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:39 -msgid "No parents" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:49 -msgid "No children" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:62 -#: kallithea/templates/changeset/changeset_file_comment.html:20 -#: kallithea/templates/changeset/changeset_range.html:44 +#: kallithea/templates/changeset/changeset.html:37 +msgid "parent rev." +msgstr "" + +#: kallithea/templates/changeset/changeset.html:43 +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 msgid "Changeset status" msgstr "" +#: kallithea/templates/changeset/changeset.html:55 +#: kallithea/templates/changeset/diff_block.html:27 +#: kallithea/templates/files/diff_2way.html:52 +msgid "Raw diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:58 +msgid "Patch diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:61 +#: kallithea/templates/changeset/diff_block.html:30 +#: kallithea/templates/files/diff_2way.html:55 +msgid "Download diff" +msgstr "" + #: kallithea/templates/changeset/changeset.html:67 -#: kallithea/templates/changeset/diff_block.html:22 -msgid "Raw diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:68 -msgid "Patch diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:69 -#: kallithea/templates/changeset/diff_block.html:23 -msgid "Download diff" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:73 -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: 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:73 -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: 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:103 -#: kallithea/templates/changeset/changeset_range.html:82 +#: kallithea/templates/changeset/changeset.html:88 +#: kallithea/templates/changeset/changeset_range.html:89 msgid "merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:126 -#: kallithea/templates/compare/compare_diff.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/changeset/changeset.html:124 +#: kallithea/templates/compare/compare_diff.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:160 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:128 -#: kallithea/templates/compare/compare_diff.html:42 -#: kallithea/templates/pullrequests/pullrequest_show.html:115 +#: kallithea/templates/changeset/changeset.html:126 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:162 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:141 -#: kallithea/templates/changeset/changeset.html:153 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -#: kallithea/templates/pullrequests/pullrequest_show.html:195 +#: 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:141 -#: kallithea/templates/changeset/changeset.html:153 -#: kallithea/templates/compare/compare_diff.html:58 -#: kallithea/templates/compare/compare_diff.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -#: kallithea/templates/pullrequests/pullrequest_show.html:195 +#: 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 +msgid "no revisions" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:23 +#, python-format +msgid "Vote on pull request #%s" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:25 +#, python-format +msgid "Comment on pull request #%s" +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:30 -#, python-format -msgid "Status change on pull request #%s" +msgid "Status change on changeset" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:32 -#, python-format -msgid "Comment on pull request #%s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:55 +msgid "Comment on changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:63 msgid "Submitting..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/templates/changeset/changeset_file_comment.html:66 msgid "Commenting on line {1}." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -#: kallithea/templates/changeset/changeset_file_comment.html:145 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:61 -#: kallithea/templates/changeset/changeset_file_comment.html:147 +#: 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:65 -#: kallithea/templates/changeset/changeset_file_comment.html:152 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/changeset_file_comment.html:166 #, fuzzy msgid "Preview" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:170 -msgid "Comment preview" -msgstr "" - #: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:177 -#: kallithea/templates/email_templates/changeset_comment.html:16 -#: kallithea/templates/email_templates/pull_request_comment.html:16 -msgid "Comment" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:81 -msgid "Cancel" +#: kallithea/templates/changeset/changeset_file_comment.html:189 +msgid "Comment preview" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:196 +#: kallithea/templates/email_templates/changeset_comment.html:11 +#: kallithea/templates/email_templates/pull_request_comment.html:16 +msgid "Comment" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:96 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:96 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:92 +#: kallithea/templates/changeset/changeset_file_comment.html:100 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:149 -msgid "Change status" +#: kallithea/templates/changeset/changeset_file_comment.html:159 +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 "Comment and close" +msgid "Close (when approved or rejected)" msgstr "" #: kallithea/templates/changeset/changeset_range.html:5 @@ -3878,23 +4833,30 @@ msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:52 +#: kallithea/templates/changeset/changeset_range.html:59 msgid "Files affected" msgstr "" #: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:29 +#: kallithea/templates/changeset/diff_block.html:24 +#: kallithea/templates/changeset/diff_block.html:68 +#: kallithea/templates/files/diff_2way.html:49 +msgid "Show full side-by-side diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:38 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:53 +#: kallithea/templates/changeset/diff_block.html:62 msgid "Show file at latest version in this repo" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:64 msgid "Show file at initial version in this repo" msgstr "" @@ -3902,82 +4864,79 @@ msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:32 +#: kallithea/templates/compare/compare_cs.html:8 msgid "Ancestor" msgstr "" -#: kallithea/templates/compare/compare_diff.html:5 +#: kallithea/templates/compare/compare_diff.html:6 +#: kallithea/templates/compare/compare_diff.html:8 #, fuzzy, python-format msgid "%s Compare" msgstr "" -#: kallithea/templates/compare/compare_diff.html:9 +#: kallithea/templates/compare/compare_diff.html:16 msgid "Compare revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 -#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/templates/compare/compare_diff.html:36 +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 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:48 -#: kallithea/templates/pullrequests/pullrequest_show.html:121 +#: kallithea/templates/compare/compare_diff.html:65 +#: kallithea/templates/pullrequests/pullrequest_show.html:168 msgid "No files" msgstr "" -#: kallithea/templates/compare/compare_diff.html:58 -#: kallithea/templates/compare/compare_diff.html:69 -msgid "confirm to show potentially huge diff" -msgstr "" - -#: kallithea/templates/data_table/_dt_elements.html:54 -#: kallithea/templates/summary/summary.html:69 +#: kallithea/templates/data_table/_dt_elements.html:63 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:56 -#: kallithea/templates/summary/summary.html:72 +#: kallithea/templates/data_table/_dt_elements.html:65 msgid "Git repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 -#, python-format -msgid "Fork of %s" -msgstr "" - -#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/templates/data_table/_dt_elements.html:72 +msgid "Public repository" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:82 +msgid "Repository creating in progress..." +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:96 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:95 -#: kallithea/templates/data_table/_dt_elements.html:97 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "" - #: kallithea/templates/data_table/_dt_elements.html:103 #: kallithea/templates/data_table/_dt_elements.html:105 #, python-format -msgid "Subscribe to %s atom feed" -msgstr "" - -#: kallithea/templates/data_table/_dt_elements.html:122 +msgid "Subscribe to %s rss feed" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:111 +#: kallithea/templates/data_table/_dt_elements.html:113 #, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: kallithea/templates/data_table/_dt_elements.html:137 -#, python-format -msgid "Confirm to delete this user: %s" -msgstr "" - -#: 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 -msgid "URL" +msgid "Subscribe to %s atom feed" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:141 +msgid "Creating" msgstr "" #: kallithea/templates/email_templates/changeset_comment.html:6 @@ -3985,7 +4944,7 @@ msgid "%s commented on a %s changeset." msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:14 +#: kallithea/templates/email_templates/changeset_comment.html:9 msgid "The changeset status was changed to" msgstr "" @@ -4018,9 +4977,9 @@ msgstr "" #: kallithea/templates/email_templates/pull_request.html:8 -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:31 #: kallithea/templates/pullrequests/pullrequest_data.html:14 -#: kallithea/templates/pullrequests/pullrequest_show.html:25 +#: kallithea/templates/pullrequests/pullrequest_show.html:28 msgid "Title" msgstr "" @@ -4041,76 +5000,84 @@ msgid "View this user here" msgstr "" -#: kallithea/templates/errors/error_document.html:55 +#: 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 +msgid "File diff" +msgstr "" + +#: kallithea/templates/files/diff_2way.html:58 +msgid "ignore white space" +msgstr "" + +#: kallithea/templates/files/diff_2way.html:59 +msgid "turn on edit mode" +msgstr "" + #: kallithea/templates/files/file_diff.html:4 #, fuzzy, python-format msgid "%s File Diff" msgstr "" -#: kallithea/templates/files/file_diff.html:8 -msgid "File diff" -msgstr "" - #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:76 +#: kallithea/templates/files/files.html:84 #, fuzzy, python-format msgid "%s Files" msgstr "" -#: kallithea/templates/files/files.html:30 -#: kallithea/templates/files/files_add.html:31 -#: kallithea/templates/files/files_edit.html:31 -msgid "Branch" -msgstr "" - #: kallithea/templates/files/files_add.html:4 #, fuzzy, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:19 -msgid "Add file" -msgstr "" - -#: kallithea/templates/files/files_add.html:43 -msgid "File Name" -msgstr "" - -#: kallithea/templates/files/files_add.html:47 -#: kallithea/templates/files/files_add.html:56 -msgid "or" +#: 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_ypjax.html:3 +msgid "Location" msgstr "" #: kallithea/templates/files/files_add.html:47 -#: kallithea/templates/files/files_add.html:52 -msgid "Upload file" -msgstr "" - -#: kallithea/templates/files/files_add.html:56 -msgid "Create new file" -msgstr "" - -#: kallithea/templates/files/files_add.html:61 -#: kallithea/templates/files/files_edit.html:37 -#: kallithea/templates/files/files_ypjax.html:3 -msgid "Location" -msgstr "" - -#: kallithea/templates/files/files_add.html:65 -msgid "use / to separate directories" -msgstr "" - -#: kallithea/templates/files/files_add.html:79 -#: kallithea/templates/files/files_edit.html:65 +msgid "Enter filename..." +msgstr "" + +#: kallithea/templates/files/files_add.html:49 +#: kallithea/templates/files/files_add.html:53 +msgid "or" +msgstr "" + +#: kallithea/templates/files/files_add.html:49 +msgid "Upload 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 -msgid "View" +msgid "revision" msgstr "" #: kallithea/templates/files/files_browser.html:14 @@ -4121,116 +5088,131 @@ msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:23 +#: kallithea/templates/files/files_browser.html:22 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:27 -msgid "Search file list" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 +#: 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:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Size" msgstr "" -#: kallithea/templates/files/files_browser.html:49 +#: kallithea/templates/files/files_browser.html:43 msgid "Mimetype" msgstr "" -#: kallithea/templates/files/files_browser.html:50 +#: kallithea/templates/files/files_browser.html:44 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:45 msgid "Last modified" msgstr "" -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:46 msgid "Last committer" msgstr "" +#: kallithea/templates/files/files_delete.html:4 +#, fuzzy, python-format +msgid "%s Files Delete" +msgstr "" + +#: kallithea/templates/files/files_delete.html:25 +#: kallithea/templates/files/files_delete.html:45 +msgid "Delete file" +msgstr "" + #: kallithea/templates/files/files_edit.html:4 #, fuzzy, python-format -msgid "%s Files Edit" -msgstr "" - -#: kallithea/templates/files/files_edit.html:19 +msgid "%s File Edit" +msgstr "" + +#: kallithea/templates/files/files_edit.html:25 msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:47 -#: kallithea/templates/files/files_source.html:23 -msgid "Show annotation" -msgstr "" - -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:26 -msgid "Download as raw" -msgstr "" - -#: kallithea/templates/files/files_edit.html:52 +#: 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" +msgstr "" + +#: kallithea/templates/files/files_edit.html:58 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:57 +#: 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 -msgid "History" -msgstr "" - -#: kallithea/templates/files/files_history_box.html:9 -msgid "Diff to revision" -msgstr "" - -#: kallithea/templates/files/files_history_box.html:10 -#, fuzzy -msgid "Show at revision" -msgstr "" - -#: kallithea/templates/files/files_history_box.html:11 -msgid "Show full history" -msgstr "" - -#: kallithea/templates/files/files_history_box.html:16 #, fuzzy, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:6 -msgid "Load file history" -msgstr "" - -#: kallithea/templates/files/files_source.html:21 -msgid "Show source" -msgstr "" - -#: kallithea/templates/files/files_source.html:29 +#: kallithea/templates/files/files_source.html:7 +msgid "Diff to Revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:8 +#, fuzzy +msgid "Show at Revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:10 +msgid "Show Full History" +msgstr "" + +#: kallithea/templates/files/files_source.html:11 +#, fuzzy +msgid "Show Authors" +msgstr "" + +#: kallithea/templates/files/files_source.html:30 +msgid "Show Source" +msgstr "" + +#: kallithea/templates/files/files_source.html:38 #, python-format -msgid "Edit on branch:%s" -msgstr "" - -#: kallithea/templates/files/files_source.html:31 -msgid "Edit on branch:?" -msgstr "" - -#: kallithea/templates/files/files_source.html:31 +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/templates/files/files_source.html:41 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:44 msgid "Editing files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:46 +#: kallithea/templates/files/files_source.html:45 +msgid "Deleting files allowed only when on branch head revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:61 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:55 +#: kallithea/templates/files/files_source.html:71 msgid "File is too big to display" msgstr "" @@ -4238,11 +5220,11 @@ msgid "annotation" msgstr "" -#: kallithea/templates/files/files_ypjax.html:15 -msgid "Go back" -msgstr "" - -#: kallithea/templates/files/files_ypjax.html:16 +#: kallithea/templates/files/files_ypjax.html:23 +msgid "Go Back" +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:24 msgid "No files at given path" msgstr "" @@ -4251,9 +5233,9 @@ msgid "%s Followers" msgstr "" -#: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:183 -#: kallithea/templates/summary/summary.html:184 +#: kallithea/templates/followers/followers.html:12 +#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:150 msgid "Followers" msgstr "" @@ -4262,36 +5244,37 @@ msgstr "" #: kallithea/templates/forks/fork.html:5 -#, python-format -msgid "%s Fork" -msgstr "" - -#: kallithea/templates/forks/fork.html:28 +#, fuzzy, python-format +msgid "Fork repository %s" +msgstr "" + +#: kallithea/templates/forks/fork.html:30 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:65 +#: kallithea/templates/forks/fork.html:71 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:74 +#: kallithea/templates/forks/fork.html:80 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:78 -msgid "Copy permissions from forked repository" -msgstr "" - #: kallithea/templates/forks/fork.html:84 +msgid "Copy permissions from forked repository" +msgstr "" + +#: kallithea/templates/forks/fork.html:90 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:88 +#: kallithea/templates/forks/fork.html:94 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:93 -msgid "Fork this repository" +#: kallithea/templates/forks/fork.html:99 +#, fuzzy +msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 @@ -4299,9 +5282,9 @@ msgid "%s Forks" msgstr "" -#: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:189 -#: kallithea/templates/summary/summary.html:190 +#: kallithea/templates/forks/forks.html:12 +#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:156 msgid "Forks" msgstr "" @@ -4313,25 +5296,16 @@ msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:24 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:25 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:32 -msgid "Refresh" -msgstr "" - -#: kallithea/templates/journal/journal.html:35 -#: kallithea/templates/journal/public_journal.html:24 -msgid "ATOM feed" -msgstr "" - -#: kallithea/templates/journal/journal.html:51 -msgid "Watched" +#: kallithea/templates/journal/journal.html:57 +msgid "My repos" msgstr "" #: kallithea/templates/journal/journal_data.html:55 @@ -4339,15 +5313,15 @@ msgstr "" #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:24 msgid "Public Journal" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:16 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:17 msgid "RSS public journal feed" msgstr "" @@ -4356,46 +5330,42 @@ msgid "New pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:25 -msgid "Create new pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:47 +#: kallithea/templates/pullrequests/pullrequest.html:44 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:53 +#: kallithea/templates/pullrequests/pullrequest.html:50 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:65 +#: kallithea/templates/pullrequests/pullrequest.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:68 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:85 -msgid "Send pull request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest.html:94 -#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#: 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:103 -#: kallithea/templates/pullrequests/pullrequest_show.html:149 +#: kallithea/templates/pullrequests/pullrequest.html:100 +#: kallithea/templates/pullrequests/pullrequest_show.html:116 msgid "owner" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:115 +#: kallithea/templates/pullrequests/pullrequest.html:114 msgid "Add reviewer to this pull request." msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:129 +#: kallithea/templates/pullrequests/pullrequest.html:128 msgid "Detailed compare view" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:150 +#: kallithea/templates/pullrequests/pullrequest.html:149 msgid "Destination repository" msgstr "" @@ -4404,49 +5374,51 @@ msgid "%s Pull Request #%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:36 msgid "Review status" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:40 -msgid "Pull request status" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:42 +#: kallithea/templates/pullrequests/pullrequest_show.html:43 +msgid "Pull request status calculated from votes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:56 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:62 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:89 -msgid "Created on" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:102 -msgid "Compare view" +#: kallithea/templates/pullrequests/pullrequest_show.html:77 +#: kallithea/templates/pullrequests/pullrequest_show.html:79 +msgid "Pull changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:116 +#, fuzzy +msgid "reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:133 +msgid "Add or remove reviewer to this pull request." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:137 +#, fuzzy +msgid "Save Changes" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:149 -#, fuzzy -msgid "reviewer" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:164 -msgid "Add or remove reviewer to this pull request." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:168 -#, fuzzy -msgid "Save changes" +msgid "Compare view" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:4 @@ -4454,32 +5426,61 @@ msgid "%s Pull Requests" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show_all.html:12 +#, python-format +msgid "Pull requests from %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:14 +#, python-format +msgid "Pull requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:38 +#, python-format +msgid "Show pull requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:40 +#, python-format +msgid "Show pull requests from %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:50 +msgid "Hide closed pull requests" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:52 +msgid "Show closed pull requests too" +msgstr "" + #: kallithea/templates/search/search.html:6 -msgid "Search repository" +#, fuzzy, python-format +msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 -#: kallithea/templates/search/search.html:16 +#: kallithea/templates/search/search.html:19 msgid "Search in all repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:53 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:66 +#: kallithea/templates/search/search.html:69 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:70 msgid "File names" msgstr "" @@ -4489,6 +5490,75 @@ msgid "Permission denied" msgstr "" +#: kallithea/templates/summary/statistics.html:4 +#, python-format +msgid "%s Statistics" +msgstr "" + +#: kallithea/templates/summary/statistics.html:19 +#: kallithea/templates/summary/summary.html:42 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:20 +#: kallithea/templates/summary/summary.html:43 +#, python-format +msgid "%s RSS feed" +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 +msgid "files" +msgstr "" + +#: kallithea/templates/summary/statistics.html:115 +#: kallithea/templates/summary/summary.html:378 +msgid "Show more" +msgstr "" + +#: kallithea/templates/summary/statistics.html:392 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:393 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +msgid "files changed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:395 +msgid "files removed" +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 "" + #: kallithea/templates/summary/summary.html:4 #, python-format msgid "%s Summary" @@ -4496,171 +5566,86 @@ #: kallithea/templates/summary/summary.html:16 #, python-format -msgid "%s ATOM feed" -msgstr "" - -#: kallithea/templates/summary/summary.html:17 -#, python-format -msgid "%s RSS feed" -msgstr "" - -#: kallithea/templates/summary/summary.html:62 -#, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:64 +#: kallithea/templates/summary/summary.html:18 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:83 -#, python-format -msgid "Non changable ID %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:88 -msgid "Public" -msgstr "" - -#: kallithea/templates/summary/summary.html:88 -#: kallithea/templates/summary/summary.html:89 -msgid "Fork of" -msgstr "" - -#: kallithea/templates/summary/summary.html:97 -msgid "Remote clone" -msgstr "" - -#: kallithea/templates/summary/summary.html:117 -msgid "Contact" -msgstr "" - -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:76 msgid "Clone url" msgstr "" -#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:81 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:82 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:99 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:151 -#: kallithea/templates/summary/summary.html:167 -msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/summary.html:159 +#: 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 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:127 +msgid "Download as zip" +msgstr "" + +#: kallithea/templates/summary/summary.html:132 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: kallithea/templates/summary/summary.html:132 +msgid "with subrepos" +msgstr "" + #: kallithea/templates/summary/summary.html:163 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:165 -msgid "Downloads are disabled for this repository" +msgid "Repository Size" msgstr "" #: kallithea/templates/summary/summary.html:170 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:174 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:174 -msgid "with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:197 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:204 -#: kallithea/templates/summary/summary.html:206 +#: kallithea/templates/summary/summary.html:172 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:224 -msgid "Commit activity by day / author" -msgstr "" - -#: kallithea/templates/summary/summary.html:232 -msgid "enable" -msgstr "" - -#: kallithea/templates/summary/summary.html:235 -msgid "Stats gathered: " -msgstr "" - -#: kallithea/templates/summary/summary.html:256 +#: kallithea/templates/summary/summary.html:193 msgid "Latest changes" msgstr "" -#: kallithea/templates/summary/summary.html:258 +#: kallithea/templates/summary/summary.html:195 msgid "Quick start" msgstr "" -#: kallithea/templates/summary/summary.html:272 +#: kallithea/templates/summary/summary.html:209 #, python-format -msgid "Readme file from revision %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:332 +msgid "Readme file from revision %s:%s" +msgstr "" + +#: kallithea/templates/summary/summary.html:299 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/summary/summary.html:379 -msgid "files" -msgstr "" - -#: kallithea/templates/summary/summary.html:689 -msgid "commits" -msgstr "" - -#: kallithea/templates/summary/summary.html:690 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/summary.html:691 -msgid "files changed" -msgstr "" - -#: kallithea/templates/summary/summary.html:692 -msgid "files removed" -msgstr "" - -#: kallithea/templates/summary/summary.html:694 -msgid "commit" -msgstr "" - -#: kallithea/templates/summary/summary.html:695 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/summary.html:696 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/summary.html:697 -msgid "file removed" -msgstr "" - #: kallithea/templates/tags/tags.html:5 #, python-format msgid "%s Tags" msgstr "" -#: kallithea/templates/tags/tags.html:26 +#: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr ""
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -1,108 +1,111 @@ -# Translations template for Kallithea. +# French translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. # Translators: # FIRST AUTHOR <EMAIL@ADDRESS>, 2011 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" -"Language-Team: French (http://www.transifex.com/projects/p/Kallithea/language/fr/)\n" +"Language-Team: French " +"(http://www.transifex.com/projects/p/Kallithea/language/fr/)\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 + +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "Toutes les branches" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "Afficher les espaces et tabulations" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "Ignorer les espaces et tabulations" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "Changement de statut -> %s" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" - -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +"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 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "Accueil" -#: kallithea/controllers/error.py:99 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de syntaxe" - -#: kallithea/controllers/error.py:102 +#: kallithea/controllers/error.py:101 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" +"Le serveur n’a pas pu interpréter la requête à cause d’une erreur de " +"syntaxe" + +#: kallithea/controllers/error.py:104 msgid "Unauthorized access to resource" msgstr "Accès interdit à cet ressource" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "Vous n’avez pas la permission de voir cette page" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:108 msgid "The resource could not be found" msgstr "Ressource introuvable" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "La requête n’a pu être traitée en raison d’une erreur survenue sur le serveur." - -#: kallithea/controllers/feed.py:53 +msgstr "" +"La requête n’a pu être traitée en raison d’une erreur survenue sur le " +"serveur." + +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "Changements sur le dépôt %s" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "Flux %s de %s" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -112,405 +115,409 @@ msgid "Changeset was too big and was cut off..." msgstr "Cet ensemble de changements était trop important et a été découpé…" -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "%s a commité, le %s" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Ajouter un nouveau fichier" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "Ce dépôt a été verrouillé par %s sur %s." -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "%s édité via Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "Aucun changement" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "%s ajouté par Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "Aucun contenu" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "Aucun nom de fichier" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:522 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue." -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "Dépôt vide." -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:774 -#: kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:775 -#: kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s." -#: kallithea/controllers/home.py:81 +#: kallithea/controllers/home.py:86 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "Dépôts" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "Journal public" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "Journal" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "Vous vous êtes inscrits avec succès à Kallithea" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé." -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "" -"Your password reset was successful, new password has been sent to your email" -msgstr "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a été envoyé par e-mail." - -#: kallithea/controllers/pullrequests.py:138 +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" +"Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " +"été envoyé par e-mail." + +#: kallithea/controllers/pullrequests.py:140 #: kallithea/templates/changeset/changeset.html:13 #: kallithea/templates/email_templates/changeset_comment.html:15 msgid "Changeset" msgstr "Changements" -#: kallithea/controllers/pullrequests.py:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "Signets" -#: kallithea/controllers/pullrequests.py:328 +#: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères." -#: kallithea/controllers/pullrequests.py:330 +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès." -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "Une erreur est survenue durant l’envoi de la requête de pull." -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès." -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "" -#: kallithea/controllers/pullrequests.py:520 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" - -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/pullrequests.py:522 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" -msgstr "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de code Whoosh." - -#: kallithea/controllers/search.py:142 +msgstr "" +"L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " +"code Whoosh." + +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "Aucune donnée actuellement disponible." -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "5 minute" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" -msgstr "1 heure" +msgid "forever" +msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" -msgstr "1 jour" +msgid "5 minutes" +msgstr "5 minute" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "1 mois" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "1 heure" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/users.py:292 +msgid "1 day" +msgstr "1 jour" + +#: kallithea/controllers/admin/gists.py:64 #: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:293 +msgid "1 month" +msgstr "1 mois" + +#: kallithea/controllers/admin/gists.py:68 +#: kallithea/controllers/admin/my_account.py:263 +#: kallithea/controllers/admin/users.py:295 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" -msgstr "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." - -#: kallithea/controllers/admin/my_account.py:125 +msgstr "" +"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" +" fonctionnement de l’application." + +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur." -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail." -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur." -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Aucun" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "Lire" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" -msgstr "Écrire" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Aucun" #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 +msgid "Read" +msgstr "Lire" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "Écrire" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -529,467 +536,442 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "Administration" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 msgid "Disabled" msgstr "Interdite" -#: kallithea/controllers/admin/permissions.py:76 -msgid "Allowed with manual account activation" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "Autorisée" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "Ce groupe contient %s dépôts et ne peut être supprimé." -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès." -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés." -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour." -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" -msgstr "Une erreur est survenue durant la configuration du journal public pour ce dépôt." - -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +msgstr "" +"Une erreur est survenue durant la configuration du journal public pour ce" +" dépôt." + +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect." -#: kallithea/controllers/admin/repos.py:544 +#: kallithea/controllers/admin/repos.py:546 msgid "Nothing" msgstr "[Aucun dépôt]" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage." -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:596 -msgid "Locked" -msgstr "" - #: kallithea/controllers/admin/repos.py:598 +msgid "Locked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "Le dépôt a été %s." -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante." -#: kallithea/controllers/admin/repos.py:671 +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour." -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: kallithea/controllers/admin/settings.py:269 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour." -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté." -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée." -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "" -"Your license will expire on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "" -"Your license has expired on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:571 -msgid "" -"Unexpected error while reading license key. Please make sure your license " -"token and key are correct" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions." -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès." -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur." -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "Vous ne pouvez pas éditer cet utilisateur" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action." -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page." -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:80 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Cet ensemble de changements était trop gros pour être affiché et a été découpé, utilisez le menu « Diff » pour afficher les différences." - -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:82 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"Cet ensemble de changements était trop gros pour être affiché et a été " +"découpé, utilisez le menu « Diff » pour afficher les différences." + +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "Aucun changement détecté." @@ -1025,8 +1007,7 @@ msgid "%s more" msgstr "%s de plus" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "révisions" @@ -1121,138 +1102,112 @@ msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "Aucun fichier" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from the" -" filesystem please run the application again in order to rescan repositories" -msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été créé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts." - -#: kallithea/lib/utils2.py:413 +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"Le dépôt %s n’est pas représenté dans la base de données. Il a " +"probablement été créé ou renommé manuellement. Veuillez relancer " +"l’application pour rescanner les dépôts." + +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:440 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" msgstr "à l’instant" -#: 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: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:1659 -msgid "Repository no access" -msgstr "Aucun accès au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py: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:1660 -msgid "Repository read access" -msgstr "Accès en lecture au dépôt" - #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 @@ -1265,8 +1220,8 @@ #: 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 write access" -msgstr "Accès en écriture au dépôt" +msgid "Repository no access" +msgstr "Aucun accès au dépôt" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 @@ -1280,159 +1235,159 @@ #: 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 admin access" -msgstr "Accès administrateur au dépôt" +msgid "Repository read access" +msgstr "Accès en lecture au dépôt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" +msgstr "Accès en écriture au dépôt" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no access" -msgstr "Aucun accès au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repositories Group read access" -msgstr "Accès en lecture au groupe de dépôts" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 +msgid "Repository admin access" +msgstr "Accès administrateur au dépôt" #: kallithea/lib/dbmigrate/schema/db_1_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 "Repositories Group write access" -msgstr "Accès en écriture au groupe de dépôts" +msgid "Repositories Group no access" +msgstr "Aucun accès au groupe de dépôts" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repositories Group admin access" -msgstr "Accès administrateur au groupe de dépôts" +msgid "Repositories Group read access" +msgstr "Accès en lecture au groupe de dépôts" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 +msgid "Repositories Group write access" +msgstr "Accès en écriture au groupe de dépôts" #: 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 -#: 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:1657 -msgid "Kallithea Administrator" -msgstr "Administrateur Kallithea" - -#: 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: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:1680 -msgid "Repository creation disabled" -msgstr "Création de dépôt désactivée" +msgid "Repositories Group admin access" +msgstr "Accès administrateur au groupe de dépôts" #: 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: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:1681 -msgid "Repository creation enabled" -msgstr "Création de dépôt activée" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 +msgid "Kallithea Administrator" +msgstr "Administrateur Kallithea" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 +msgid "Repository creation disabled" +msgstr "Création de dépôt désactivée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking disabled" -msgstr "Fork de dépôt désactivé" - -#: 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: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:1686 -msgid "Repository forking enabled" -msgstr "Fork de dépôt activé" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" +msgstr "Création de dépôt activée" #: kallithea/lib/dbmigrate/schema/db_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 -msgid "Register disabled" -msgstr "Enregistrement désactivé" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" +msgstr "Fork de dépôt désactivé" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "Fork de dépôt activé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "Enregistrement désactivé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 msgid "Register new user with Kallithea with manual activation" msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: 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:2210 -msgid "Not Reviewed" -msgstr "Pas encore relue" - -#: 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: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:2211 -msgid "Approved" -msgstr "Approuvée " - #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 @@ -1445,8 +1400,8 @@ #: 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 "Rejected" -msgstr "Rejetée" +msgid "Not Reviewed" +msgstr "Pas encore relue" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 @@ -1460,45 +1415,51 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 +msgid "Approved" +msgstr "Approuvée " + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 +msgid "Rejected" +msgstr "Rejetée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 msgid "Under Review" msgstr "En cours de relecture" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 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:1664 -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:1665 -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 @@ -1508,7 +1469,7 @@ #: 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 write access" +msgid "Repository group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1520,9 +1481,22 @@ #: 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 admin access" -msgstr "" - +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_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 @@ -1531,18 +1505,7 @@ #: 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 "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:1670 -msgid "User group read access" +msgid "Repository group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1553,7 +1516,7 @@ #: 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 write access" +msgid "User group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1564,7 +1527,18 @@ #: 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 admin access" +msgid "User group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1575,20 +1549,20 @@ #: 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 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:1675 -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 @@ -1597,42 +1571,31 @@ #: 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 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 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:1688 -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:1689 -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 @@ -1641,27 +1604,47 @@ #: 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 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:75 +#: 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 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "à la ligne %s" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "[Mention]" @@ -1687,73 +1670,79 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:230 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:231 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - #: kallithea/model/notification.py:232 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:233 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:234 #, python-format +msgid "%(user)s registered in Kallithea at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:235 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:236 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "Dernier sommet" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" -msgstr "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." - -#: kallithea/model/user.py:268 +msgstr "" +"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" +" fonctionnement de l’application." + +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" -msgstr "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." - -#: kallithea/model/user.py:274 +msgstr "" +"Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " +"bon fonctionnement de l’application." + +#: kallithea/model/user.py:276 #, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch owners " -"or remove those repositories. %s" -msgstr "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez les propriétaires de ces dépôts. %s" - -#: kallithea/model/user.py:302 +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" +"L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " +"les propriétaires de ces dépôts. %s" + +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "" @@ -1774,8 +1763,8 @@ #: kallithea/model/validators.py:124 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" msgstr "" #: kallithea/model/validators.py:151 @@ -1866,7 +1855,9 @@ #: kallithea/model/validators.py:494 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou svn+http(s)." +msgstr "" +"URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou " +"svn+http(s)." #: kallithea/model/validators.py:519 msgid "Fork have to be the same type as parent" @@ -1903,14 +1894,18 @@ #: kallithea/model/validators.py:791 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" -msgstr "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom d’utilisateur." +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" +"L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" +" d’utilisateur." #: kallithea/model/validators.py:804 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" -msgstr "Les révisions %(revs)s font déjà partie de la requête de pull ou on des statuts définis." +msgstr "" +"Les révisions %(revs)s font déjà partie de la requête de pull ou on des " +"statuts définis." #: kallithea/model/validators.py:836 msgid "Please enter a valid IPv4 or IpV6 address" @@ -1918,8 +1913,7 @@ #: kallithea/model/validators.py:837 #, python-format -msgid "" -"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" #: kallithea/model/validators.py:870 @@ -1935,6 +1929,10 @@ 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "Tableau de bord" @@ -2056,7 +2054,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2068,7 +2066,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2084,7 +2082,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2096,8 +2094,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 -#: kallithea/templates/base/root.html:73 +#: 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 @@ -2107,7 +2104,7 @@ msgstr "Chargement…" #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "Connexion" @@ -2122,14 +2119,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 msgid "Username" msgstr "Nom d’utilisateur" #: kallithea/templates/login.html:52 kallithea/templates/register.html:49 #: kallithea/templates/admin/my_account/my_account.html:39 #: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "Mot de passe" @@ -2145,7 +2142,7 @@ msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" @@ -2244,7 +2241,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "Historique d’administration" @@ -2306,7 +2303,7 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "" @@ -2329,12 +2326,12 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "" @@ -2368,7 +2365,7 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "" @@ -2392,7 +2389,9 @@ msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." -msgstr "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés comme collaborateurs." +msgstr "" +"Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " +"comme collaborateurs." #: kallithea/templates/admin/defaults/defaults.html:58 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 @@ -2543,7 +2542,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2618,7 +2616,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "Mon compte" @@ -2796,8 +2794,8 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:26 msgid "" -"Your user is in an external Source of Record; some details cannot be managed" -" here" +"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 @@ -2847,7 +2845,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2874,7 +2872,7 @@ msgstr "Commentaires" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "" @@ -2892,7 +2890,7 @@ msgstr "Notification" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "Notifications" @@ -2905,7 +2903,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "Permissions" @@ -2936,8 +2934,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2983,8 +2981,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to repository groups allows creating repositories inside" +" that group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3032,7 +3030,7 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "" @@ -3078,8 +3076,7 @@ #: 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:77 -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "Options" @@ -3205,9 +3202,11 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" -msgstr "Activer le verrou lors d’un pull sur le groupe. Cette option sera appliquée à tous les sous-groupes et dépôts de ce groupe." +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" +"Activer le verrou lors d’un pull sur le groupe. Cette option sera " +"appliquée à tous les sous-groupes et dépôts de ce groupe." #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format @@ -3254,9 +3253,10 @@ #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 #: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." -msgstr "Gardez cette description précise et concise. Utilisez un fichier README pour des descriptions plus détaillées." +msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" +"Gardez cette description précise et concise. Utilisez un fichier README " +"pour des descriptions plus détaillées." #: kallithea/templates/admin/repos/repo_add_base.html:45 #: kallithea/templates/forks/fork.html:55 @@ -3291,8 +3291,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:30 #, python-format msgid "" -"Repository \"%(repo_name)s\" is beeing created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:42 @@ -3354,9 +3354,11 @@ #: 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 "Le descriptif des actions réalisées sur ce dépôt sera visible à tous depuis le journal public." +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" +"Le descriptif des actions réalisées sur ce dépôt sera visible à tous " +"depuis le journal public." #: kallithea/templates/admin/repos/repo_edit_advanced.html:49 msgid "Change locking" @@ -3384,9 +3386,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:73 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Trigering a pull locks repository by user who pulled, only the same user can" -" unlock by doing a push" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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 @@ -3416,9 +3418,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" +"This repository will be renamed in a special way in order to be " +"unaccesible for Kallithea and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 @@ -3431,9 +3433,11 @@ #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" -msgstr "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce dépôt, il sera à nouveau mis en cache." +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" +"Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce " +"dépôt, il sera à nouveau mis en cache." #: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "List of cached values" @@ -3525,9 +3529,12 @@ #: 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 allways be accessible under such url.\n" -" Usefull 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 above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull 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 @@ -3562,7 +3569,9 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:55 #: kallithea/templates/forks/fork.html:65 msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "Révision par défaut pour les pages de fichiers, de téléchargements, de recherche et de documentation." +msgstr "" +"Révision par défaut pour les pages de fichiers, de téléchargements, de " +"recherche et de documentation." #: kallithea/templates/admin/repos/repo_edit_settings.html:65 msgid "Change owner of this repository." @@ -3621,10 +3630,6 @@ msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "" @@ -3707,12 +3712,11 @@ #: kallithea/templates/admin/settings/settings_global.html:50 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" +"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_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3724,8 +3728,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3736,57 +3740,6 @@ msgid "Failed to remove hook" msgstr "Erreur lors de la suppression du hook." -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "" -"Please enter following lines (if yet not present) into [app:main] section of" -" your .ini file. The token below is autogenerated." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "" @@ -3797,8 +3750,9 @@ #: 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." +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3807,8 +3761,8 @@ #: 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." +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 @@ -3817,8 +3771,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallitheas GIT hooks are installed for each repository. Current" +" hooks will be updated to latest version" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3844,6 +3798,10 @@ msgstr "Mettre à jour l’index" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "" @@ -3933,14 +3891,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this" -" value a restart and rescan of the repository folder are required." +"Filesystem location where repositories should be stored. After changing " +"this value a restart and rescan of the repository folder are required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3970,22 +3928,34 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar url allows you to use other avatar server application.\n" -" Following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:54 @@ -3994,8 +3964,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:58 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:64 @@ -4043,7 +4013,7 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "" @@ -4127,7 +4097,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "Utilisateurs" @@ -4197,8 +4167,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4238,50 +4208,50 @@ msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "Résumé" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "Historique" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "Fichiers" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "Options" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "Comparer le fork" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4291,112 +4261,112 @@ msgid "Compare" msgstr "Comparer" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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 "Rechercher" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:182 -msgid "Unfollow" -msgstr "" - #: kallithea/templates/base/base.html:185 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "Fork" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "Connexion à votre compte" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "Se déconnecter" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "Historique" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "Journal public" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:321 -msgid "Gists" -msgstr "" - #: kallithea/templates/base/base.html:324 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:325 -msgid "All public gists" +msgid "Gists" msgstr "" #: kallithea/templates/base/base.html:327 -msgid "My public gists" +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:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "" @@ -4407,8 +4377,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4457,84 +4427,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:45 msgid "Add another comment" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:47 msgid "Start following this repository" msgstr "Suivre ce dépôt" -#: kallithea/templates/base/root.html:50 +#: kallithea/templates/base/root.html:48 msgid "Group" msgstr "Groupe" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:49 msgid "members" msgstr "Membres" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:50 #: kallithea/templates/pullrequests/pullrequest.html:202 msgid "Loading ..." msgstr "" +#: kallithea/templates/base/root.html:51 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:52 +msgid "Search truncated" +msgstr "" + #: kallithea/templates/base/root.html:53 -msgid "loading ..." +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:54 -msgid "Search truncated" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "No matching files" -msgstr "" - -#: kallithea/templates/base/root.html:56 #: kallithea/templates/changelog/changelog.html:51 #: kallithea/templates/pullrequests/pullrequest_show_all.html:33 msgid "Open new pull request" msgstr "Nouvelle requête de pull" +#: kallithea/templates/base/root.html:55 +msgid "Open new pull request for selected changesets" +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Show selected changesets __S -> __E" +msgstr "" + #: kallithea/templates/base/root.html:57 -msgid "Open new pull request for selected changesets" +msgid "Show selected changeset __S" msgstr "" #: kallithea/templates/base/root.html:58 -msgid "Show selected changesets __S -> __E" -msgstr "" +msgid "Selection link" +msgstr "Lien vers la sélection" #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse diff" msgstr "" #: kallithea/templates/base/root.html:60 -msgid "Selection link" -msgstr "Lien vers la sélection" +msgid "Expand diff" +msgstr "" #: kallithea/templates/base/root.html:61 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:62 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:63 -msgid "Failed to revoke permission" -msgstr "" - -#: kallithea/templates/base/root.html:64 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr "" @@ -4839,13 +4809,16 @@ #: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "Comments parsed using %s syntax with %s support." -msgstr "Les commentaires sont analysés avec la syntaxe %s, avec le support de la commande %s." +msgstr "" +"Les commentaires sont analysés avec la syntaxe %s, avec le support de la " +"commande %s." #: kallithea/templates/changeset/changeset_file_comment.html:69 #: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "" -"Use @username inside this text to send notification to this Kallithea user" -msgstr "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à l’utilisateur Kallithea en question." +msgid "Use @username inside this text to send notification to this Kallithea user" +msgstr "" +"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " +"l’utilisateur Kallithea en question." #: kallithea/templates/changeset/changeset_file_comment.html:73 #: kallithea/templates/changeset/changeset_file_comment.html:166 @@ -5032,7 +5005,8 @@ #: 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." +"%s opened a pull request for repository %s and wants you to review " +"changes." msgstr "" #: kallithea/templates/email_templates/pull_request.html:8 @@ -5702,3 +5676,4 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "" +
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -1,4 +1,4 @@ -# Translations template for Kallithea. +# Japanese translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. # Translators: @@ -7,109 +7,106 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, 2011 # こいんとす <tkondou@gmail.com>, 2013 # Takumi IINO <trot.thunder@gmail.com>, 2013 -# こいんとす <tkondou@gmail.com>, 2013 -# shirou - しろう, 2013 # whosaysni <whosaysni@gmail.com>, 2014 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/Kallithea/language/ja/)\n" +"Language-Team: Japanese " +"(http://www.transifex.com/projects/p/Kallithea/language/ja/)\n" +"Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"Language: ja\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 + +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "まだチェンジセットがありません" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "すべてのブランチ" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "(閉鎖済み)" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "空白を表示" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "空白を無視" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "diff コンテキストを %(num)s 行増やす" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "お探しのリビジョンはこのリポジトリにはありません" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "ステータス変更 -> %s" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" +"Changing status on a changeset associated with a closed pull request is " +"not allowed" msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません" -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 msgid "Select changeset" msgstr "リビジョンを選択" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "ホームページ" -#: kallithea/controllers/error.py:99 -msgid "" -"The request could not be understood by the server due to malformed syntax." +#: kallithea/controllers/error.py:101 +msgid "The request could not be understood by the server due to malformed syntax." msgstr "形式が間違っているため、サーバーはリクエストを処理できませんでした" -#: kallithea/controllers/error.py:102 +#: kallithea/controllers/error.py:104 msgid "Unauthorized access to resource" msgstr "リソースにアクセスする権限がありません" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "このページを閲覧する権限がありません" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:108 msgid "The resource could not be found" msgstr "リソースが見つかりません" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "サーバーが不正な状態になったため、リクエストに答えることができませんでした。" -#: kallithea/controllers/feed.py:53 +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "%s リポジトリでの変更" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "%s %s フィード" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -119,405 +116,403 @@ msgid "Changeset was too big and was cut off..." msgstr "チェンジセットが大きすぎるため、省略しました" -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "%s が %s にコミット" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "新しいファイルを追加" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "まだファイルがありません。 %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Kallithea経由で %s を削除" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "%s ファイルの削除に成功しました" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます。" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "Kallithea経由で %s を変更" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "変更点なし" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "Kallithea経由でファイルを追加" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "内容がありません" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "ファイル名がありません" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "場所には相対パスかつ .. を含まないパスを入力してください" -#: kallithea/controllers/files.py:522 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "空のリポジトリ" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "チェンジセット" -#: kallithea/controllers/files.py:774 -#: kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "ブランチ" -#: kallithea/controllers/files.py:775 -#: kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "タグ" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: kallithea/controllers/home.py:81 +#: kallithea/controllers/home.py:86 msgid "Groups" msgstr "グループ" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "リポジトリ" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "ブランチ" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "タグ" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "ブックマーク" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "公開ジャーナル" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "ジャーナル" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "キャプチャが一致しません" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "Kallitheaへの登録を受け付けました" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "パスワードリセットのリンクを送信しました" -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "" -"Your password reset was successful, new password has been sent to your email" +"Your password reset was successful, new password has been sent to your " +"email" msgstr "パスワードをリセットに成功しました。新しいパスワードをあなたのメールアドレスに送りました" -#: kallithea/controllers/pullrequests.py:138 +#: 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:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "スペシャル" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "相手のブランチ" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "ブックマーク" -#: kallithea/controllers/pullrequests.py:328 +#: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: kallithea/controllers/pullrequests.py:330 +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "プルリクエスト作成中にエラーが発生しました: %s" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストの作成に成功しました" -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "この状態で閉じる：" -#: kallithea/controllers/pullrequests.py:520 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" +#: kallithea/controllers/pullrequests.py:522 +msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "拒否（rejected）または承諾（approved）以外のステータスでのプルリクエスト解決は禁止されています。" -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" -#: kallithea/controllers/search.py:142 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーが発生しました" -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "まだデータが読み込まれていません" -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "認証設定の更新に成功しました" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "認証設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "デフォルト設定の更新に成功しました" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "デフォルト設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "無期限" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "5 分" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" -msgstr "1 時間" +msgid "forever" +msgstr "無期限" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" -msgstr "1 日" +msgid "5 minutes" +msgstr "5 分" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "1 ヶ月" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "1 時間" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/users.py:292 +msgid "1 day" +msgstr "1 日" + +#: kallithea/controllers/admin/gists.py:64 #: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:293 +msgid "1 month" +msgstr "1 ヶ月" + +#: kallithea/controllers/admin/gists.py:68 +#: kallithea/controllers/admin/my_account.py:263 +#: kallithea/controllers/admin/users.py:295 msgid "Lifetime" msgstr "有効期間" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "gist の作成中にエラーが発生しました" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "gist %s を削除しました" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "変更なし" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "Gist の内容を更新しました" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "Gist データを更新しました" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "Gist %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: kallithea/controllers/admin/my_account.py:125 +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "アカウントの更新に成功しました" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメールアドレス %s を追加しました" -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "ユーザーからメールアドレスを削除しました" -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "APIキーの作成に成功しました" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "APIキーのリセットに成功しました" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "APIキーの削除に成功しました" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "なし" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "読込" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" -msgstr "書込" +#: 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 +msgid "Read" +msgstr "読込" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "書込" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -536,467 +531,438 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 msgid "Disabled" msgstr "無効" -#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:78 msgid "Allowed with manual account activation" msgstr "手動でアカウントをアクティベートする" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "自動でアカウントをアクティベートする" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "外部アカウントを自動でアクティベートする" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "有効" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "全般の権限の更新に成功しました" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "リポジトリグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "リポジトリグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "このグループは %s 個のサブグループを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "自分自身の管理者としての権限を取り消すことはできません" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "リポジトリグループ権限を更新しました" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "権限の取消中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "リポジトリ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成しました" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "%s 個のフォークを切り離しました" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "%s 個のフォークを削除しました" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "フォークしたリポジトリが存在するため、 %s は削除できません" -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "%s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "リポジトリ権限を更新しました" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "フィールドの作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "フィールドの削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "-- フォークではありません --" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "トークンが一致しません" -#: kallithea/controllers/admin/repos.py:544 +#: kallithea/controllers/admin/repos.py:546 msgid "Nothing" msgstr "ありません" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとする" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "リポジトリをロックしました" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "リポジトリのロックを解除しました" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "アンロック中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "アンロック" -#: kallithea/controllers/admin/repos.py:596 +#: kallithea/controllers/admin/repos.py:598 msgid "Locked" msgstr "ロック" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "リポジトリは %s されています" -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "キャッシュの無効化に成功しました" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "リモートから取得" -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:671 +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "VCS設定を更新しました" -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません。" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" -#: kallithea/controllers/admin/settings.py:269 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "フックを更新しました" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "ライセンス情報を更新しました" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "ライセンス情報の更新中にエラーが発生しました" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "" -"Your license will expire on %s, please contact support to extend your " -"license." -msgstr "%s にライセンスが失効します。サポート窓口に連絡してライセンスを延長してください。" - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "" -"Your license has expired on %s, please contact support to extend your " -"license." -msgstr "%s にライセンスが失効しました。サポート窓口に連絡してライセンスを延長してください。" - -#: kallithea/controllers/admin/settings.py:571 -msgid "" -"Unexpected error while reading license key. Please make sure your license " -"token and key are correct" -msgstr "ライセンスキーの読み込み中に予期しないエラーが発生しました。正しいライセンストークンとキーを使っているか確かめてください" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "ユーザーグループ %s を作成しました" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "対象に同じ物を選ぶことはできません" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "ユーザーグループ権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "ユーザー %s を作成しました" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "このユーザーは編集できません" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "ユーザーホワイトリストにIP %s を追加しました" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "IPアドレスの保存中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "バイナリファイル" -#: kallithea/lib/diffs.py:80 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" +#: kallithea/lib/diffs.py:82 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください" -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "検出された変更はありません" @@ -1032,8 +998,7 @@ msgid "%s more" msgstr "%s 以上" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "リビジョン" @@ -1128,132 +1093,105 @@ msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "ファイルなし" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "新しいファイル" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "変更" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "削除" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "リネーム" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, 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 "%s リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" - -#: kallithea/lib/utils2.py:413 +"%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 "" +"%s " +"リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" + +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "%s 以内" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%s ago" msgstr "%s 前" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:440 #, python-format msgid "in %s and %s" msgstr "%s と %s の間" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" 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: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:1659 -msgid "Repository no 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: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:1660 -msgid "Repository read 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:1305 @@ -1266,8 +1204,8 @@ #: 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 write access" -msgstr "リポジトリに書込権限でアクセス" +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 @@ -1281,159 +1219,159 @@ #: 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 admin access" -msgstr "リポジトリに管理権限でアクセス" +msgid "Repository read access" +msgstr "リポジトリに読込権限でアクセス" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" +msgstr "リポジトリに書込権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no 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:1309 -msgid "Repositories Group read access" -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:1664 +msgid "Repository admin 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 "Repositories Group write access" -msgstr "リポジトリグループに書込権限でアクセス" +msgid "Repositories 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 "Repositories Group admin access" -msgstr "リポジトリグループに管理権限でアクセス" +msgid "Repositories Group read 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 "Repositories Group write access" +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 -#: 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:1657 -msgid "Kallithea Administrator" -msgstr "Kallithea 管理者" - -#: 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: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:1680 -msgid "Repository creation disabled" -msgstr "リポジトリの作成を有効にする" +msgid "Repositories Group admin access" +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: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:1681 -msgid "Repository creation enabled" -msgstr "リポジトリの作成を有効にする" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 +msgid "Kallithea Administrator" +msgstr "Kallithea 管理者" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 +msgid "Repository creation disabled" +msgstr "リポジトリの作成を有効にする" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking 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: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:1686 -msgid "Repository forking enabled" -msgstr "リポジトリのフォークを有効にする" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" +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 -msgid "Register disabled" -msgstr "新規登録を無効にする" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" +msgstr "リポジトリのフォークを無効にする" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "リポジトリのフォークを有効にする" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "新規登録を無効にする" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 msgid "Register new user with Kallithea with manual activation" msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" msgstr "Kallitheaに登録した新しいユーザーを自動でアクティベートする" -#: 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: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:2210 -msgid "Not Reviewed" -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: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:2211 -msgid "Approved" -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:1765 @@ -1446,8 +1384,8 @@ #: 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 "Rejected" -msgstr "却下" +msgid "Not Reviewed" +msgstr "未レビュー" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 @@ -1461,45 +1399,51 @@ #: 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 msgid "Under Review" msgstr "レビュー中" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 msgid "top level" msgstr "top level" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -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:1665 -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 @@ -1509,8 +1453,8 @@ #: 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 write access" -msgstr "リポジトリグループに書込権限でアクセス" +msgid "Repository group no access" +msgstr "リポジトリグループへのアクセス権限なし" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1521,9 +1465,22 @@ #: 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 admin access" -msgstr "リポジトリグループに管理権限でアクセス" - +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_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 @@ -1532,19 +1489,8 @@ #: 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 "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:1670 -msgid "User group read access" -msgstr "ユーザーグループに読込権限でアクセス" +msgid "Repository group admin access" +msgstr "リポジトリグループに管理権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1554,8 +1500,8 @@ #: 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 write access" -msgstr "ユーザーグループに書込権限でアクセス" +msgid "User group no access" +msgstr "ユーザーグループへのアクセス権限なし" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1565,8 +1511,19 @@ #: 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 admin access" -msgstr "ユーザーグループに管理権限でアクセス" +msgid "User group read access" +msgstr "ユーザーグループに読込権限でアクセス" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" +msgstr "ユーザーグループに書込権限でアクセス" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1576,20 +1533,20 @@ #: 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 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:1675 -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 @@ -1598,42 +1555,31 @@ #: 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 msgid "User Group creation disabled" msgstr "ユーザーグループの作成を無効にする" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 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:1688 -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:1689 -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 @@ -1642,27 +1588,47 @@ #: 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 msgid "User Registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "" -"Repository creation enabled with write permission to a repository group" +#: 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 +msgid "Repository creation enabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "" -"Repository creation disabled with write permission to a repository group" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" -#: kallithea/model/comment.py:75 +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "%s 行目" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "[Mention]" @@ -1688,73 +1654,73 @@ msgid "Name must not contain only digits" msgstr "数字だけの名前は使えません" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s がチェンジセットにコメント %(when)s" -#: kallithea/model/notification.py:230 +#: kallithea/model/notification.py:232 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s がメッセージを送信 %(when)s" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:233 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s がにあなたにメンション %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:234 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s がKallitheaに登録 %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:235 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s が新しいプルリクエストを作成 %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:236 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s がプルリクエストにコメント %(when)s" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "最新のtip" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "新規ユーザー登録" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: kallithea/model/user.py:268 +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: kallithea/model/user.py:274 +#: 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" +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s" -#: kallithea/model/user.py:302 +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "パスワードリセットのリンク" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "新しいパスワード" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "新しいKallitheaパスワード:%s" @@ -1775,8 +1741,8 @@ #: kallithea/model/validators.py:124 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必要があります" #: kallithea/model/validators.py:151 @@ -1801,7 +1767,9 @@ msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります " +msgstr "" +"ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" +" " #: kallithea/model/validators.py:218 msgid "Cannot assign this group as parent" @@ -1904,8 +1872,8 @@ #: kallithea/model/validators.py:791 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです" #: kallithea/model/validators.py:804 @@ -1919,8 +1887,7 @@ #: kallithea/model/validators.py:837 #, python-format -msgid "" -"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)" #: kallithea/model/validators.py:870 @@ -1936,6 +1903,10 @@ msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われています" +#: kallithea/templates/about.html:4 kallithea/templates/about.html:20 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "ダッシュボード" @@ -2057,7 +2028,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2069,7 +2040,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2085,7 +2056,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2097,8 +2068,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 -#: kallithea/templates/base/root.html:73 +#: 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 @@ -2108,7 +2078,7 @@ msgstr "読み込み中..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "ログイン" @@ -2123,14 +2093,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 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:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "パスワード" @@ -2146,7 +2116,7 @@ msgid "Forgot your password ?" msgstr "パスワードを忘れた?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "アカウントを持っていない?" @@ -2245,7 +2215,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "管理者ジャーナル" @@ -2306,7 +2276,7 @@ msgstr "認証設定" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "認証" @@ -2329,12 +2299,12 @@ msgstr "有効な組み込みプラグイン" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "有効" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "無効" @@ -2368,7 +2338,7 @@ msgstr "リポジトリのデフォルト設定" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "デフォルト設定" @@ -2435,7 +2405,9 @@ msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." -msgstr "編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 %(here)s をクリックして新しいバージョンを読み込みなおしてください。" +msgstr "" +"編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 %(here)s " +"をクリックして新しいバージョンを読み込みなおしてください。" #: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/new.html:43 @@ -2543,7 +2515,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2618,7 +2589,7 @@ msgstr "Raw形式で表示" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "アカウント" @@ -2796,8 +2767,8 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:26 msgid "" -"Your user is in an external Source of Record; some details cannot be managed" -" here" +"Your user is in an external Source of Record; some details cannot be " +"managed here" msgstr "ユーザーは外部の Source of Record に属しているため、ここでは詳細を管理できません" #: kallithea/templates/admin/my_account/my_account_pullrequests.html:2 @@ -2847,7 +2818,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2874,7 +2845,7 @@ msgstr "コメント" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "プルリクエスト" @@ -2892,7 +2863,7 @@ msgstr "通知を表示" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "通知" @@ -2905,7 +2876,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "権限設定" @@ -2936,8 +2907,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "選択したパーミッションで、各リポジトリのデフォルトパーミッションをリセットします。各リポジトリの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2983,8 +2954,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to repository groups allows creating repositories inside" +" that group" msgstr "リポジトリグループに書き込みパーミッションを付与すると、グループ内にリポジトリを作成できるようになります" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3032,7 +3003,7 @@ msgstr "リポジトリグループを追加" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "リポジトリグループ" @@ -3078,8 +3049,7 @@ #: 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:77 -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "設定" @@ -3204,8 +3174,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" msgstr "グループのpullのロックを有効にします。このオプションはグループに含まれる全てのグループとリポジトリに適用されます。" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 @@ -3253,8 +3223,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 #: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" #: kallithea/templates/admin/repos/repo_add_base.html:45 @@ -3290,8 +3259,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:30 #, python-format msgid "" -"Repository \"%(repo_name)s\" is beeing created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" msgstr "リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトします。" #: kallithea/templates/admin/repos/repo_creating.html:42 @@ -3353,8 +3322,8 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:43 msgid "" -"All actions made on this repository will be accessible to everyone in public" -" journal" +"All actions made on this repository will be accessible to everyone in " +"public journal" msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" #: kallithea/templates/admin/repos/repo_edit_advanced.html:49 @@ -3383,9 +3352,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:73 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Trigering a pull locks repository by user who pulled, only the same user can" -" unlock by doing a push" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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 @@ -3414,10 +3383,12 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" -msgstr "このリポジトリはKallitheaとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n完全な削除が必要な場合はファイルシステムから手動で削除してください" +"This repository will be renamed in a special way in order to be " +"unaccesible for Kallithea and VCS systems. If you need to fully delete it" +" from file system please do it manually" +msgstr "" +"このリポジトリはKallitheaとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n" +"完全な削除が必要な場合はファイルシステムから手動で削除してください" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate repository cache" @@ -3429,8 +3400,8 @@ #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 @@ -3523,10 +3494,16 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" -"In case this repository is renamed or moved into another group the repository url changes.\n" -" Using above url guarantees that this repository will allways be accessible under such url.\n" -" Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service." -msgstr "通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリのURLが変わります。\n上のURLを使えば、常にリポジトリにアクセスできます。\nこの機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLをハードコードしたいときに便利です。" +"In case this repository is renamed or moved into another group the " +"repository url changes.\n" +" Using above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull for CI systems, or any other cases" +" that you need to hardcode the url into 3rd party service." +msgstr "" +"通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリのURLが変わります。\n" +"上のURLを使えば、常にリポジトリにアクセスできます。\n" +"この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLをハードコードしたいときに便利です。" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Clone uri" @@ -3619,10 +3596,6 @@ msgid "System Info" msgstr "システム情報" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "ライセンス" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "メールアドレスプレフィックス" @@ -3705,12 +3678,11 @@ #: kallithea/templates/admin/settings/settings_global.html:50 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration" msgstr "reCaptchaの秘密鍵。この値が設定されると登録時のキャプチャが有効になります。" #: kallithea/templates/admin/settings/settings_global.html:55 -#: kallithea/templates/admin/settings/settings_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3722,8 +3694,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "フックを使うと、リポジトリへのプッシュやプルといった特定のイベントに合わせて、何らかのアクションを実行できます。フック機能では、Pythonの関数を呼び出したり、外部アプリケーションを起動したりできます。" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3734,57 +3706,6 @@ msgid "Failed to remove hook" msgstr "フックの削除に失敗しました" -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "20ユーザーまで利用可能な無料ライセンスを使用しています。" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "Kallithea バージョン" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "ライセンストークン" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "設定されていません" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "ライセンス発行先" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "ライセンス発行日" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "ライセンスユーザー制限" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "制限なし" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "ライセンス有効期限" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "ライセンスキー" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "Kallithea ライセンスキーをテキストエリアにペーストしてください。" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "" -"Please enter following lines (if yet not present) into [app:main] section of" -" your .ini file. The token below is autogenerated." -msgstr "以下の行を .ini ファイルの [app:main] セクションに (まだなければ) 入力してください。以下のトークンは、自動生成されています。" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "再スキャンオプション" @@ -3795,8 +3716,9 @@ #: 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." +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." msgstr "リポジトリがファイルシステム上からなくなったのに、データベース上には残っている場合、このオプションを選んで、データベースから古いデータベースを検出し、削除してください。" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3805,8 +3727,8 @@ #: 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." +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." msgstr "このオプションを選ぶと、各リポジトリのキャッシュデータを抹消します。データのリロードやキャッシュキーの消去が必要なときに使ってください。" #: kallithea/templates/admin/settings/settings_mapping.html:23 @@ -3815,8 +3737,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallitheas GIT hooks are installed for each repository. Current" +" hooks will be updated to latest version" msgstr "各リポジトリに Kallitheas の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3842,6 +3764,10 @@ msgstr "再インデックス" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "Kallithea バージョン" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "更新を確認" @@ -3923,7 +3849,9 @@ msgid "" "Requires hgsubversion library to be installed. Allows cloning remote SVN " "repositories and migrates them to Mercurial type." -msgstr "hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。" +msgstr "" +"hgsubversion " +"ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。" #: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "Repositories location" @@ -3931,14 +3859,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "アンロックする。この設定を有効にするためにはKallitheaの再起動が必要です。" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this" -" value a restart and rescan of the repository folder are required." +"Filesystem location where repositories should be stored. After changing " +"this value a restart and rescan of the repository folder are required." msgstr "リポジトリを保存するファイルシステムのロケーション。この値を変更した場合、サーバーの再起動とリポジトリフォルダの再スキャンが必要です。" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3968,23 +3896,54 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar url allows you to use other avatar server application.\n" -" Following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" -msgstr "Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n必要に応じて、 URL に以下の変数を使ってください。\n{scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n{email} ユーザーのメールアドレス\n{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n{size} サーバーアプリケーションに要求する画像のサイズ\n{netloc} Kallithea サーバーのアドレスまたはホスト名" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" +msgstr "" +"Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n" +"必要に応じて、 URL に以下の変数を使ってください。\n" +"{scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n" +"{email} ユーザーのメールアドレス\n" +"{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n" +"{size} サーバーアプリケーションに要求する画像のサイズ\n" +"{netloc} Kallithea サーバーのアドレスまたはホスト名" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" -msgstr "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のような形式にします。使える変数は下記の通りです:\n {scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n {user} ユーザーのユーザー名\n {netloc} Kallithea サーバーのアドレスまたはホスト名\n {repo} リポジトリの完全な名前\n {repoid} リポジトリの ID。 clone-by-id に使います。" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" +msgstr "" +"クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' " +"のような形式にします。使える変数は下記の通りです:\n" +" {scheme} " +"Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n" +" {user} " +"ユーザーのユーザー名\n" +" {netloc} " +"Kallithea サーバーのアドレスまたはホスト名\n" +" {repo} " +"リポジトリの完全な名前\n" +" {repoid} リポジトリの " +"ID。 clone-by-id に使います。" #: kallithea/templates/admin/settings/settings_visual.html:54 msgid "Dashboard items" @@ -3992,8 +3951,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:58 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "メインページダッシュボードで1ページに表示する要素数。" #: kallithea/templates/admin/settings/settings_visual.html:64 @@ -4041,7 +4000,7 @@ msgstr "ユーザーグループを追加" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "ユーザーグループ" @@ -4125,7 +4084,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "ユーザー" @@ -4195,8 +4154,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "このユーザーは外部の Source of Record (%s) に属しています。ここでは詳細を管理できません。" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4236,50 +4195,50 @@ msgid "Server instance: %s" msgstr "サーバーインスタンス: %s" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "サポート" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "フォークを作成" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "要約" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "履歴" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "ファイル" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "ブランチの切り替え" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "オプション" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "フォークを比較" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4289,112 +4248,112 @@ msgid "Compare" msgstr "比較" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "アンロック" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "ロック" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "フォロー" -#: kallithea/templates/base/base.html:182 +#: kallithea/templates/base/base.html:185 msgid "Unfollow" msgstr "アンフォロー" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "フォーク" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "%s のプルリクエストを表示" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "ログインしていません" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "ログイン" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "パスワードを忘れた?" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "ログアウト" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "最近の活動を表示" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "ジャーナル" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "公開ジャーナル" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "公開 gists を表示" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:324 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:327 msgid "Create new gist" msgstr "新しい gist を作成" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:328 msgid "All public gists" msgstr "すべての公開 gists" -#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:330 msgid "My public gists" msgstr "公開 gists" -#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:331 msgid "My private gists" msgstr "非公開 gists" -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "リポジトリから検索" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "一致するものが見つかりません" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "キーボードショートカット" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "サイト全体" @@ -4405,9 +4364,11 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." -msgstr "Select to inherit permissions from %s permissions settings, and default IP address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." +msgstr "" +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." #: kallithea/templates/base/default_perms_box.html:28 msgid "Create repositories" @@ -4455,84 +4416,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:45 msgid "Add another comment" msgstr "別のコメントを追加" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:47 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: kallithea/templates/base/root.html:50 +#: kallithea/templates/base/root.html:48 msgid "Group" msgstr "グループ" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:49 msgid "members" msgstr "メンバー" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:50 #: kallithea/templates/pullrequests/pullrequest.html:202 msgid "Loading ..." msgstr "読み込み中..." -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:51 msgid "loading ..." msgstr "読み込み中..." -#: kallithea/templates/base/root.html:54 +#: kallithea/templates/base/root.html:52 msgid "Search truncated" msgstr "検索結果は省略されています" -#: kallithea/templates/base/root.html:55 +#: kallithea/templates/base/root.html:53 msgid "No matching files" msgstr "マッチするファイルはありません" -#: kallithea/templates/base/root.html:56 +#: 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:57 +#: kallithea/templates/base/root.html:55 msgid "Open new pull request for selected changesets" msgstr "選択したチェンジセットから新しいプルリクエストを作成" -#: kallithea/templates/base/root.html:58 +#: kallithea/templates/base/root.html:56 msgid "Show selected changesets __S -> __E" msgstr "選択した変更 __S -> __E を表示" +#: kallithea/templates/base/root.html:57 +msgid "Show selected changeset __S" +msgstr "選択した変更 __S を表示" + +#: kallithea/templates/base/root.html:58 +msgid "Selection link" +msgstr "セレクション・リンク" + #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" -msgstr "選択した変更 __S を表示" - -#: kallithea/templates/base/root.html:60 -msgid "Selection link" -msgstr "セレクション・リンク" - -#: kallithea/templates/base/root.html:61 #: kallithea/templates/changeset/diff_block.html:8 msgid "Collapse diff" msgstr "差分をたたむ" -#: kallithea/templates/base/root.html:62 +#: kallithea/templates/base/root.html:60 msgid "Expand diff" msgstr "差分を表示" -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/base/root.html:61 msgid "Failed to revoke permission" msgstr "権限の取消に失敗しました" -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/base/root.html:62 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "権限 {0}: {1} を取り消してもよろしいですか？" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr "チェンジセットを指定" @@ -4610,7 +4571,9 @@ msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" -msgstr "チェンジセットステータス: %s\n関連するプルリクエスト #%s を開く" +msgstr "" +"チェンジセットステータス: %s\n" +"関連するプルリクエスト #%s を開く" #: kallithea/templates/changelog/changelog.html:86 #: kallithea/templates/compare/compare_cs.html:18 @@ -4836,8 +4799,7 @@ #: 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" +msgid "Use @username inside this text to send notification to this Kallithea user" msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します" #: kallithea/templates/changeset/changeset_file_comment.html:73 @@ -5024,7 +4986,8 @@ #: 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." +"%s opened a pull request for repository %s and wants you to review " +"changes." msgstr "ユーザ %s がリポジトリ %s で新しいプルリクエストを作成しました。変更をレビューしてください。" #: kallithea/templates/email_templates/pull_request.html:8 @@ -5692,3 +5655,4 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "タグを比較" +
--- a/kallithea/i18n/kallithea.pot Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/kallithea.pot Wed Jul 02 19:08:27 2014 -0400 @@ -1,13 +1,13 @@ # Translations template for Kallithea. -# Copyright (C) 2014 RhodeCode GmbH +# Copyright (C) 2014 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. # FIRST AUTHOR <EMAIL@ADDRESS>, 2014. ##, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 2.2.5\n" -"Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"Report-Msgid-Bugs-To: marcin@maq.io\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\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" @@ -16,86 +16,86 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "Changing status on a changeset associated with a closed pull request is not allowed" msgstr "" -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "" -#: kallithea/controllers/error.py:99 +#: kallithea/controllers/error.py:101 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:102 -msgid "Unauthorized access to resource" -msgstr "" - #: kallithea/controllers/error.py:104 -msgid "You don't have permission to view this page" +msgid "Unauthorized access to resource" msgstr "" #: kallithea/controllers/error.py:106 -msgid "The resource could not be found" +msgid "You don't have permission to view this page" msgstr "" #: kallithea/controllers/error.py:108 +msgid "The resource could not be found" +msgstr "" + +#: kallithea/controllers/error.py:110 msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:53 +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -105,401 +105,401 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:522 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:533 -#, python-format -msgid "Unknown revision %s" -msgstr "" - #: kallithea/controllers/files.py:535 -msgid "Empty repository" +#, python-format +msgid "Unknown revision %s" msgstr "" #: kallithea/controllers/files.py:537 +msgid "Empty repository" +msgstr "" + +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:81 -msgid "Groups" -msgstr "" - #: kallithea/controllers/home.py:86 +msgid "Groups" +msgstr "" + +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "" -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: kallithea/controllers/pullrequests.py:138 +#: 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:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:328 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - #: kallithea/controllers/pullrequests.py:330 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "" -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "" -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: kallithea/controllers/search.py:142 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "" -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "" -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" +msgid "forever" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: 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 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:125 +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" +#: 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 +msgid "Read" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -518,458 +518,436 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 -msgid "Disabled" -msgstr "" - #: kallithea/controllers/admin/permissions.py:76 -msgid "Allowed with manual account activation" +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +msgid "Disabled" msgstr "" #: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:544 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:546 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:596 -msgid "Locked" -msgstr "" - #: kallithea/controllers/admin/repos.py:598 +msgid "Locked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:671 +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" msgstr "" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: kallithea/controllers/admin/settings.py:269 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "Your license will expire on %s, please contact support to extend your license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "Your license has expired on %s, please contact support to extend your license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:571 -msgid "Unexpected error while reading license key. Please make sure your license token and key are correct" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "" -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:80 +#: kallithea/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "" @@ -1100,136 +1078,106 @@ msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, 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:413 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:436 -#, python-format -msgid "%s ago" -msgstr "" - #: kallithea/lib/utils2.py:438 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/utils2.py:440 +#, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" 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: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:1659 -msgid "Repository no 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: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:1660 -msgid "Repository read 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:1305 @@ -1242,7 +1190,7 @@ #: 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 write access" +msgid "Repository no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 @@ -1257,159 +1205,159 @@ #: 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 admin access" +msgid "Repository read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no 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:1309 -msgid "Repositories Group read access" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_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 "Repositories Group write access" +msgid "Repositories 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 "Repositories Group admin access" +msgid "Repositories Group read 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 "Repositories Group write access" 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 -#: 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:1657 -msgid "Kallithea Administrator" -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: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:1680 -msgid "Repository creation disabled" +msgid "Repositories Group admin access" 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: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:1681 -msgid "Repository creation enabled" +#: 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:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking disabled" +#: 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: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:1686 -msgid "Repository forking enabled" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_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 -msgid "Register disabled" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "" + +#: 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:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" 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: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:2210 -msgid "Not Reviewed" -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: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:2211 -msgid "Approved" -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:1765 @@ -1422,7 +1370,7 @@ #: 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 "Rejected" +msgid "Not Reviewed" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 @@ -1437,45 +1385,51 @@ #: 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 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 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:1664 -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:1665 -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 @@ -1485,7 +1439,7 @@ #: 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 write access" +msgid "Repository group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1497,9 +1451,22 @@ #: 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 admin access" -msgstr "" - +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_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 @@ -1508,18 +1475,7 @@ #: 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 "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:1670 -msgid "User group read access" +msgid "Repository group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1530,7 +1486,7 @@ #: 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 write access" +msgid "User group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1541,7 +1497,18 @@ #: 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 admin access" +msgid "User group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1552,20 +1519,20 @@ #: 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 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:1675 -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 @@ -1574,42 +1541,31 @@ #: 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 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 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:1688 -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:1689 -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 @@ -1618,25 +1574,47 @@ #: 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 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 +#: 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 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/comment.py:75 +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "" @@ -1662,71 +1640,71 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:230 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:231 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - #: kallithea/model/notification.py:232 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:233 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:234 #, python-format +msgid "%(user)s registered in Kallithea at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:235 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:236 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:268 +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: kallithea/model/user.py:274 +#: 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:302 +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "" @@ -1901,6 +1879,10 @@ 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "" @@ -2022,7 +2004,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2034,7 +2016,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2050,7 +2032,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2062,7 +2044,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 kallithea/templates/base/root.html:73 +#: 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 @@ -2072,7 +2054,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "" @@ -2087,14 +2069,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 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:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "" @@ -2110,7 +2092,7 @@ msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "" @@ -2209,7 +2191,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "" @@ -2271,7 +2253,7 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "" @@ -2292,12 +2274,12 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "" @@ -2331,7 +2313,7 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "" @@ -2502,7 +2484,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2577,7 +2558,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "" @@ -2804,7 +2785,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2831,7 +2812,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "" @@ -2849,7 +2830,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "" @@ -2862,7 +2843,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "" @@ -2976,7 +2957,7 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "" @@ -3022,7 +3003,7 @@ #: 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:77 kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "" @@ -3543,10 +3524,6 @@ msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "" @@ -3632,7 +3609,6 @@ msgstr "" #: kallithea/templates/admin/settings/settings_global.html:55 -#: kallithea/templates/admin/settings/settings_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3654,55 +3630,6 @@ msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "Please enter following lines (if yet not present) into [app:main] section of your .ini file. The token below is autogenerated." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "" @@ -3752,6 +3679,10 @@ msgstr "" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "" @@ -3937,7 +3868,7 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "" @@ -4021,7 +3952,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "" @@ -4130,50 +4061,50 @@ msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4183,112 +4114,112 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:182 -msgid "Unfollow" -msgstr "" - #: kallithea/templates/base/base.html:185 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:321 -msgid "Gists" -msgstr "" - #: kallithea/templates/base/base.html:324 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:325 -msgid "All public gists" +msgid "Gists" msgstr "" #: kallithea/templates/base/base.html:327 -msgid "My public gists" +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:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "" @@ -4347,84 +4278,84 @@ msgid "No permission defined" msgstr "" +#: kallithea/templates/base/root.html:45 +msgid "Add another comment" +msgstr "" + +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/data_table/_dt_elements.html:216 +msgid "Stop following this repository" +msgstr "" + #: kallithea/templates/base/root.html:47 -msgid "Add another comment" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:48 -#: kallithea/templates/data_table/_dt_elements.html:216 -msgid "Stop following this repository" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:49 -msgid "Start following this repository" +msgid "members" msgstr "" #: kallithea/templates/base/root.html:50 -msgid "Group" +#: kallithea/templates/pullrequests/pullrequest.html:202 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:51 -msgid "members" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:52 -#: kallithea/templates/pullrequests/pullrequest.html:202 -msgid "Loading ..." +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:53 -msgid "loading ..." +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:54 -msgid "Search truncated" +#: 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 "No matching files" +msgid "Open new pull request for selected changesets" msgstr "" #: kallithea/templates/base/root.html:56 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +msgid "Show selected changesets __S -> __E" msgstr "" #: kallithea/templates/base/root.html:57 -msgid "Open new pull request for selected changesets" +msgid "Show selected changeset __S" msgstr "" #: kallithea/templates/base/root.html:58 -msgid "Show selected changesets __S -> __E" +msgid "Selection link" msgstr "" #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse diff" msgstr "" #: kallithea/templates/base/root.html:60 -msgid "Selection link" +msgid "Expand diff" msgstr "" #: kallithea/templates/base/root.html:61 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:62 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:63 -msgid "Failed to revoke permission" -msgstr "" - -#: kallithea/templates/base/root.html:64 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr ""
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -1,4 +1,4 @@ -# Translations template for Kallithea. +# Polish translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. # Translators: @@ -9,104 +9,110 @@ # Nemcio <areczek01@gmail.com>, 2012-2013 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" -"Language-Team: Polish (http://www.transifex.com/projects/p/Kallithea/language/pl/)\n" +"Language-Team: Polish " +"(http://www.transifex.com/projects/p/Kallithea/language/pl/)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && " +"(n%100<10 || n%100>=20) ? 1 : 2)\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" -"Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 + +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "Wszystkie gałęzie" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "(zamknięty)" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "pokazuj spacje" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "Ignoruj pokazywanie spacji" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "Zmiana statusu -> %s" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest niedozwolona" - -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +"Changing status on a changeset associated with a closed pull request is " +"not allowed" +msgstr "" +"Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest " +"niedozwolona" + +#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 msgid "Select changeset" msgstr "Wybrane zmiany" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "Strona główna" -#: kallithea/controllers/error.py:99 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "Wniosek nie może być rozumiany przez serwer z powodu zniekształconej składni." - -#: kallithea/controllers/error.py:102 +#: kallithea/controllers/error.py:101 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" +"Wniosek nie może być rozumiany przez serwer z powodu zniekształconej " +"składni." + +#: kallithea/controllers/error.py:104 msgid "Unauthorized access to resource" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "Nie masz uprawnień do przeglądania tej strony" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:108 msgid "The resource could not be found" msgstr "Zasób nie został znaleziony" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie żądania." - -#: kallithea/controllers/feed.py:53 +msgstr "" +"Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie" +" żądania." + +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "Zmiany w %s repozytorium" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "%s %s zasilać" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -116,405 +122,407 @@ msgid "Changeset was too big and was cut off..." msgstr "Lista zmian była zbyt duża i została ucięta..." -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "%s zakomitowal w %s" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Kliknij tutaj, by dodać nowy plik" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "Repozytorium zostało zablokowane przez %s na %s" -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "Edytowanie %s w Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "Bez zmian" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "Dodano %s poprzez Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "Brak treści" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "Brak nazwy pliku" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "Lokalizacja musi być ścieżką względną i nie może zawierać .. ścieżki" -#: kallithea/controllers/files.py:522 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "Puste repozytorium" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "Różnice" -#: kallithea/controllers/files.py:774 -#: kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "Gałęzie" -#: kallithea/controllers/files.py:775 -#: kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "Etykiety" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: kallithea/controllers/home.py:81 +#: kallithea/controllers/home.py:86 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "Repozytoria" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "gałąź" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "Bookmark" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "Dziennik publiczny" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "dziennik" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "Udało Ci się zarejestrować na stronie" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "Twój link zresetowania hasła został wysłany" -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "" -"Your password reset was successful, new password has been sent to your email" +"Your password reset was successful, new password has been sent to your " +"email" msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" -#: kallithea/controllers/pullrequests.py:138 +#: kallithea/controllers/pullrequests.py:140 #: kallithea/templates/changeset/changeset.html:13 #: kallithea/templates/email_templates/changeset_comment.html:15 msgid "Changeset" msgstr "Grupy zmian" -#: kallithea/controllers/pullrequests.py:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "Specjalne" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "gałęzie" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "Zakładki" -#: kallithea/controllers/pullrequests.py:328 +#: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" msgstr "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami" -#: kallithea/controllers/pullrequests.py:330 +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "Zamykanie" -#: kallithea/controllers/pullrequests.py:520 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" -msgstr "Zamknij wszystkie wnioski połączenia gałęzi innych stanów niż odrzucony, zatwierdzony lub zabroniony" - -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/pullrequests.py:522 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" +"Zamknij wszystkie wnioski połączenia gałęzi innych stanów niż odrzucony, " +"zatwierdzony lub zabroniony" + +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" -#: kallithea/controllers/search.py:142 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "Żadne dane nie zostały załadowane" -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "Ustawienia autentykacji poprawnie zaktualizowane" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "wystapił błąd podczas uaktualniania ustawień autentykacji" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "wystąpił błąd podczas aktualizacji wartości domyślnych" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "na zawsze" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "5 minut" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" -msgstr "1 godzina" +msgid "forever" +msgstr "na zawsze" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" -msgstr "1 dzień" +msgid "5 minutes" +msgstr "5 minut" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "1 miesiąc" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "1 godzina" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/users.py:292 +msgid "1 day" +msgstr "1 dzień" + +#: kallithea/controllers/admin/gists.py:64 #: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:293 +msgid "1 month" +msgstr "1 miesiąc" + +#: kallithea/controllers/admin/gists.py:68 +#: kallithea/controllers/admin/my_account.py:263 +#: kallithea/controllers/admin/users.py:295 msgid "Lifetime" msgstr "Czas życia" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "Wystąpił błąd podczas tworzenia git" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "Usuń gist %s" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" -msgstr "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji" - -#: kallithea/controllers/admin/my_account.py:125 +msgstr "" +"Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " +"aplikacji" + +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "Dodano e-mail %s do użytkownika" -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "Usunięto e-mail użytkownikowi" -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Brak" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "Odczyt" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" -msgstr "Zapis" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Brak" #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 +msgid "Read" +msgstr "Odczyt" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "Zapis" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -533,467 +541,442 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "Administracja" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 msgid "Disabled" msgstr "Wyłączone" -#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:78 msgid "Allowed with manual account activation" msgstr "Dozwolona z ręczną aktywacją konta" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "Dozwolona z automatyczną aktywacją konta" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "Automatyczna aktywacja nowego konta" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "Włączone" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Globalne uprawnienia zaktualizowane poprawnie" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "Wystąpił błąd podczas aktualizacji uprawnień" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "Zaktualizowano grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "Usunięto grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "Nie można cofnąć zezwolenia dla admina jako admin" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "Wystąpił błąd podczas cofania zezwolenia" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "Gałęzi %s w repozytorium %s" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "Utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "Oderwane rozgałęzienie %s" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "Wystąpił błąd podczas usuwania %s" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "Uprawnienia repozytorium zostały zaktualizowane" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "-- Brak rozgalezienia --" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "Niezgodność tokenu" -#: kallithea/controllers/admin/repos.py:544 +#: kallithea/controllers/admin/repos.py:546 msgid "Nothing" msgstr "Brak" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "Zablokowane repozytorium" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "Odblokowane repozytorium" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "Wystąpił błąd podczas odblokowywania" -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "Odblokowany" -#: kallithea/controllers/admin/repos.py:596 +#: kallithea/controllers/admin/repos.py:598 msgid "Locked" msgstr "Zablokowany" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "Repozytoriów jest %s" -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "Cache wyczyszczony poprawnie" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:671 +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "Aktualizacja ustawień VCS" -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, usunięto: %s" - -#: kallithea/controllers/admin/settings.py:269 +msgstr "" +"Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, " +"usunięto: %s" + +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "Dodano nowy hook" -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "Zaktualizowano informacje o licencji" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "" -"Your license will expire on %s, please contact support to extend your " -"license." -msgstr "Twoja licenzja wygaśnie %s, proszę skontaktowac sie z pomocą techniczna." - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "" -"Your license has expired on %s, please contact support to extend your " -"license." -msgstr "Twoja licencja wygasła %s, proszę skontaktować sie z pomocą techniczna w celu rozszerzenia licencji." - -#: kallithea/controllers/admin/settings.py:571 -msgid "" -"Unexpected error while reading license key. Please make sure your license " -"token and key are correct" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "Utworzono grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Wystąpił błąd podczas tworzenia grupy użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "Zaktualizowano grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "Wystąpił błąd podczas aktualizacji grupy użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "Grupa użytkowników została usunięta z powodzeniem" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "Aktualizacja uprawnień" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "Utworzono użytkownika %s" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "Użytkownik został zaktualizowany" -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "Użytkownik został usunięty" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "Wystąpił błąd podczas usuwania użytkownika" -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "Nie możesz edytować tego użytkownika" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "Dodano ip %s do listy dozwolonych adresów użytkownia" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Plik binarny" -#: kallithea/lib/diffs.py:80 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby wyświetlić różnice" - -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:82 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby " +"wyświetlić różnice" + +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "Nie wykryto zmian" @@ -1029,8 +1012,7 @@ msgid "%s more" msgstr "%s więcej" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "rewizja" @@ -1125,43 +1107,47 @@ msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr "i %s więcej" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "Brak Plików" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "nowy plik" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "modyfikuj" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "kasuj" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "zmień nazwę" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, 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 "%s repozytorium nie jest mapowane do db może zostało utworzone lub zmienione z systemie plików proszę uruchomić aplikację ponownie, aby ponownie przeskanować repozytoria" - -#: kallithea/lib/utils2.py:413 +"%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 "" +"%s repozytorium nie jest mapowane do db może zostało utworzone lub " +"zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " +"ponownie przeskanować repozytoria" + +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1169,7 +1155,7 @@ msgstr[1] "%d lata" msgstr[2] "%d lat" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1177,7 +1163,7 @@ msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1185,7 +1171,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dni" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1193,7 +1179,7 @@ msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1201,7 +1187,7 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1209,60 +1195,30 @@ msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "w %s" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%s ago" msgstr "%s temu" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:440 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "%s i %s temu" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" msgstr "przed chwilą" -#: 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: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:1659 -msgid "Repository no access" -msgstr "Brak dostępu do repozytorium" - -#: 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: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:1660 -msgid "Repository read access" -msgstr "Repozytorium do odczytu" - #: 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:1305 @@ -1275,8 +1231,8 @@ #: 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 write access" -msgstr "Repozytorium do zapisu" +msgid "Repository no access" +msgstr "Brak dostępu do repozytorium" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 @@ -1290,159 +1246,159 @@ #: 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 admin access" -msgstr "Administracja dostępu do repozytorium" +msgid "Repository read access" +msgstr "Repozytorium do odczytu" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" +msgstr "Repozytorium do zapisu" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: 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:1309 -msgid "Repositories Group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 +msgid "Repository admin access" +msgstr "Administracja dostępu do repozytorium" #: kallithea/lib/dbmigrate/schema/db_1_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 "Repositories Group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" +msgid "Repositories Group no access" +msgstr "Grupy repozytoriów brak dostępu" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repositories Group admin access" -msgstr "Repozytoria Grupy dostęp administratora" +msgid "Repositories Group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + +#: 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 "Repositories Group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" #: 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 -#: 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:1657 -msgid "Kallithea Administrator" -msgstr "Administrator Repo" - -#: 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: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:1680 -msgid "Repository creation disabled" -msgstr "Tworzenie repozytorium jest wyłączone" +msgid "Repositories Group admin access" +msgstr "Repozytoria Grupy dostęp administratora" #: 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: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:1681 -msgid "Repository creation enabled" -msgstr "Tworzenie repozytorium jest włączone" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 +msgid "Kallithea Administrator" +msgstr "Administrator Repo" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 +msgid "Repository creation disabled" +msgstr "Tworzenie repozytorium jest wyłączone" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking disabled" -msgstr "Rozwidlenie repozytorium wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py: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:1686 -msgid "Repository forking enabled" -msgstr "Rozwidlenie repozytorium włączone" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" +msgstr "Tworzenie repozytorium jest włączone" #: kallithea/lib/dbmigrate/schema/db_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 -msgid "Register disabled" -msgstr "Rejestracja wyłączona" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" +msgstr "Rozwidlenie repozytorium wyłączone" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "Rozwidlenie repozytorium włączone" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "Rejestracja wyłączona" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 msgid "Register new user with Kallithea with manual activation" msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: 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:2210 -msgid "Not Reviewed" -msgstr "Brak Korekty" - -#: 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: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:2211 -msgid "Approved" -msgstr "Zaakceptowano" - #: 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:1765 @@ -1455,8 +1411,8 @@ #: 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 "Rejected" -msgstr "Odrzucono" +msgid "Not Reviewed" +msgstr "Brak Korekty" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 @@ -1470,45 +1426,51 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 +msgid "Approved" +msgstr "Zaakceptowano" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 +msgid "Rejected" +msgstr "Odrzucono" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 msgid "Under Review" msgstr "Objęty Przeglądem" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 msgid "top level" msgstr "najwyższy poziom" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1665 -msgid "Repository group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" - #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1518,8 +1480,8 @@ #: 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 write access" -msgstr "Grupy repozytoriów dostęp do zapisu" +msgid "Repository group no access" +msgstr "Grupy repozytoriów brak dostępu" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1530,9 +1492,22 @@ #: 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 admin access" -msgstr "Repozytoria Grupy dostęp administratora" - +msgid "Repository group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 +msgid "Repository group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 #: kallithea/lib/dbmigrate/schema/db_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 @@ -1541,19 +1516,8 @@ #: 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 "User group no access" -msgstr "Ta grupa użytkowników nie ma dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1670 -msgid "User group read access" -msgstr "Dostęp do grupy parametrów użytkownika" +msgid "Repository group admin access" +msgstr "Repozytoria Grupy dostęp administratora" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1563,8 +1527,8 @@ #: 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 write access" -msgstr "Ta grupa użytkowników ma prawo do zapisu" +msgid "User group no access" +msgstr "Ta grupa użytkowników nie ma dostępu" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1574,8 +1538,19 @@ #: 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 admin access" -msgstr "Ta grupa użytkowników ma uprawnienia administratora" +msgid "User group read access" +msgstr "Dostęp do grupy parametrów użytkownika" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" +msgstr "Ta grupa użytkowników ma prawo do zapisu" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1585,20 +1560,20 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 +msgid "User group admin access" +msgstr "Ta grupa użytkowników ma uprawnienia administratora" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 msgid "Repository Group creation disabled" msgstr "Tworzenie grup repozytoriów wyłączone" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1675 -msgid "Repository Group creation enabled" -msgstr "Tworzenie grup repozytoriów włączone" - #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1607,42 +1582,31 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 +msgid "Repository Group creation enabled" +msgstr "Tworzenie grup repozytoriów włączone" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 msgid "User Group creation disabled" msgstr "Tworzenie grup użytkowników wyłączone" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 msgid "User Group creation enabled" msgstr "Tworzenie grup użytkowników właczone" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Registration disabled" -msgstr "Rejestracja wyłączona" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1689 -msgid "User Registration with manual account activation" -msgstr "Rejestracja użytkownika z ręczną aktywacją konta" - #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1651,27 +1615,47 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 +msgid "Registration disabled" +msgstr "Rejestracja wyłączona" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 +msgid "User Registration with manual account activation" +msgstr "Rejestracja użytkownika z ręczną aktywacją konta" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 msgid "User Registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:75 +#: 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 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "widziany %s" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "[Wymieniony]" @@ -1697,73 +1681,79 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s skomentował zatwierdzenie %(when)s" -#: kallithea/model/notification.py:230 +#: kallithea/model/notification.py:232 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s wysłał wiadomość do %(when)s" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:233 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s wspomniał o Tobie w %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:234 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s zarejestrował na stronie w %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:235 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:236 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "ostatni tip" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "nowy użytkownik się zarejestrował" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" -msgstr "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji" - -#: kallithea/model/user.py:268 +msgstr "" +"Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " +"aplikacji" + +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" -msgstr "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej aplikacji" - -#: kallithea/model/user.py:274 +msgstr "" +"Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " +"aplikacji" + +#: 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 "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" - -#: kallithea/model/user.py:302 +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" +"użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " +"zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" + +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "łącze resetowania hasła" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "Nowe hasło" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "Nowe hasło do strony: %s" @@ -1784,9 +1774,12 @@ #: kallithea/model/validators.py:124 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" -msgstr "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub podkreśleniem" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" +msgstr "" +"Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia," +" kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub " +"podkreśleniem" #: kallithea/model/validators.py:151 msgid "The input is not valid" @@ -1810,7 +1803,9 @@ msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" +msgstr "" +"nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, " +"kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" #: kallithea/model/validators.py:218 msgid "Cannot assign this group as parent" @@ -1913,9 +1908,11 @@ #: kallithea/model/validators.py:791 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" -msgstr "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, który jest odpowiednikiem \"username\"" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" +"Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " +"który jest odpowiednikiem \"username\"" #: kallithea/model/validators.py:804 #, python-format @@ -1928,13 +1925,14 @@ #: kallithea/model/validators.py:837 #, python-format -msgid "" -"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)" #: kallithea/model/validators.py:870 msgid "Key name can only consist of letters, underscore, dash or numbers" -msgstr "Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub numerów" +msgstr "" +"Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub " +"numerów" #: kallithea/model/validators.py:884 msgid "Filename cannot be inside a directory" @@ -1945,6 +1943,10 @@ 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "Repozytorium" @@ -2066,7 +2068,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2078,7 +2080,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2094,7 +2096,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2106,8 +2108,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 -#: kallithea/templates/base/root.html:73 +#: 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 @@ -2117,7 +2118,7 @@ msgstr "Wczytywanie..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "Zaloguj się" @@ -2132,14 +2133,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 msgid "Username" msgstr "Nazwa użytkownika" #: kallithea/templates/login.html:52 kallithea/templates/register.html:49 #: kallithea/templates/admin/my_account/my_account.html:39 #: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "Hasło" @@ -2155,7 +2156,7 @@ msgid "Forgot your password ?" msgstr "Zapomniałeś hasła?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "Nie masz konta?" @@ -2254,7 +2255,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "Dziennik administratora" @@ -2317,7 +2318,7 @@ msgstr "Ustawienia Autentykacji" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "Autentykacja" @@ -2340,12 +2341,12 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "" @@ -2379,7 +2380,7 @@ msgstr "Repozytoria domyślne" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "Domyślne" @@ -2403,7 +2404,9 @@ msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." -msgstr "Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych jako współpracownicy." +msgstr "" +"Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych " +"jako współpracownicy." #: kallithea/templates/admin/defaults/defaults.html:58 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 @@ -2554,7 +2557,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2629,7 +2631,7 @@ msgstr "wyświetl jako raw" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "Moje konto" @@ -2807,8 +2809,8 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:26 msgid "" -"Your user is in an external Source of Record; some details cannot be managed" -" here" +"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 @@ -2858,7 +2860,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2885,7 +2887,7 @@ msgstr "Komentarze" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "Połączone gałęzie" @@ -2903,7 +2905,7 @@ msgstr "Pokaż powiadomienia" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "Powiadomienia" @@ -2916,7 +2918,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "Uprawnienia" @@ -2947,9 +2949,12 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" -msgstr "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie niestandardowe uprawnienia w repozytoriach zostaną utracone." +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" +"Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. " +"Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie " +"niestandardowe uprawnienia w repozytoriach zostaną utracone." #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/permissions/permissions_globals.html:40 @@ -2970,7 +2975,10 @@ "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie niestandardowe uprawnienia w repozytoriach zostaną utracone." +msgstr "" +"Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. " +"Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie " +"niestandardowe uprawnienia w repozytoriach zostaną utracone." #: kallithea/templates/admin/permissions/permissions_globals.html:46 #: kallithea/templates/data_table/_dt_elements.html:211 @@ -2982,7 +2990,11 @@ "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "Wszystkie Uprawnienia domyślne każdej grupy użytkowników zostaną przywrócone do wybranego zezwolenia, trzeba pamiętać, że wszystkie niestandardowe uprawnienia domyślne dla grup repozytorium zostaną utracone" +msgstr "" +"Wszystkie Uprawnienia domyślne każdej grupy użytkowników zostaną " +"przywrócone do wybranego zezwolenia, trzeba pamiętać, że wszystkie " +"niestandardowe uprawnienia domyślne dla grup repozytorium zostaną " +"utracone" #: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation" @@ -2994,8 +3006,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to repository groups allows creating repositories inside" +" that group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3043,7 +3055,7 @@ msgstr "Repozytorium grupy" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "Repozytorium grupy" @@ -3089,8 +3101,7 @@ #: 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:77 -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "Ustawienia" @@ -3217,9 +3228,11 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" -msgstr "Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do wszystkich innych grup i repozytoriów wewnątrz" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" +"Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do " +"wszystkich innych grup i repozytoriów wewnątrz" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format @@ -3266,8 +3279,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 #: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." #: kallithea/templates/admin/repos/repo_add_base.html:45 @@ -3303,8 +3315,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:30 #, python-format msgid "" -"Repository \"%(repo_name)s\" is beeing created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:42 @@ -3366,9 +3378,11 @@ #: 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 "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla wszystkich w dzienniku publicznym" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" +"Wszystkie działania wykonywane na tym repozytorium będą dostępne dla " +"wszystkich w dzienniku publicznym" #: kallithea/templates/admin/repos/repo_edit_advanced.html:49 msgid "Change locking" @@ -3396,9 +3410,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:73 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Trigering a pull locks repository by user who pulled, only the same user can" -" unlock by doing a push" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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 @@ -3429,10 +3443,13 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" -msgstr "To repozytorium zostanie zmienione w sposób szczególny, żeby było niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go z systemu plików prosimy zrobić to ręcznie" +"This repository will be renamed in a special way in order to be " +"unaccesible for Kallithea and VCS systems. If you need to fully delete it" +" from file system please do it manually" +msgstr "" +"To repozytorium zostanie zmienione w sposób szczególny, żeby było " +"niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go " +"z systemu plików prosimy zrobić to ręcznie" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate repository cache" @@ -3444,9 +3461,11 @@ #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" -msgstr "Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym dostępie do repozytorium zostanie dodany do bufora ponownie" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" +"Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym " +"dostępie do repozytorium zostanie dodany do bufora ponownie" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "List of cached values" @@ -3538,9 +3557,12 @@ #: 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 allways be accessible under such url.\n" -" Usefull 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 above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull 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 @@ -3634,10 +3656,6 @@ msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "" @@ -3720,12 +3738,11 @@ #: kallithea/templates/admin/settings/settings_global.html:50 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" +"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_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3737,8 +3754,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3749,57 +3766,6 @@ msgid "Failed to remove hook" msgstr "Nie udało się usunąć hooka" -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "" -"Please enter following lines (if yet not present) into [app:main] section of" -" your .ini file. The token below is autogenerated." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "ponowne skanowanie opcji" @@ -3810,8 +3776,9 @@ #: 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." +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3820,8 +3787,8 @@ #: 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." +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 @@ -3830,8 +3797,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallitheas GIT hooks are installed for each repository. Current" +" hooks will be updated to latest version" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3857,6 +3824,10 @@ msgstr "Indeksuj ponownie" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "" @@ -3946,14 +3917,16 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." -msgstr "Kliknij, aby odblokować. Musisz ponownie uruchomić Kallithea żeby wprowadzić to ustawienie w życie." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." +msgstr "" +"Kliknij, aby odblokować. Musisz ponownie uruchomić Kallithea żeby " +"wprowadzić to ustawienie w życie." #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this" -" value a restart and rescan of the repository folder are required." +"Filesystem location where repositories should be stored. After changing " +"this value a restart and rescan of the repository folder are required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3983,22 +3956,34 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar url allows you to use other avatar server application.\n" -" Following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:54 @@ -4007,8 +3992,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:58 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:64 @@ -4056,7 +4041,7 @@ msgstr "Dodaj grupę użytkowników" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "Grupy użytkowników" @@ -4140,7 +4125,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "Użytkownicy" @@ -4210,8 +4195,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4251,50 +4236,50 @@ msgid "Server instance: %s" msgstr "Wystąpienia serwera: %s" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "Podsumowanie" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "Dziennik zmian" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "Pliki" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "Przełącz do" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "Opcje" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "Porównaj rozwidlenie" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4304,112 +4289,112 @@ msgid "Compare" msgstr "Porównaj" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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 "Szukaj" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "Odblokowany" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "zablokowane" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "Obserwuj" -#: kallithea/templates/base/base.html:182 +#: kallithea/templates/base/base.html:185 msgid "Unfollow" msgstr "Nie obserwuj" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "Gałąź" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "Zaloguj się" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "Zaloguj się do swojego konta" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "Nie pamiętasz hasła?" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "Wyloguj się" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "Pokaż ostatnią aktywność" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "Dziennik" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "Dziennik publiczny" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "Wyświetl publiczne gists" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:324 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:327 msgid "Create new gist" msgstr "Utwórz nowy gist" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:328 msgid "All public gists" msgstr "Wszystkie publiczne gists" -#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:330 msgid "My public gists" msgstr "Moje publiczne gists" -#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:331 msgid "My private gists" msgstr "Moje prywatne gists" -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "" @@ -4420,8 +4405,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4430,7 +4415,9 @@ #: kallithea/templates/base/default_perms_box.html:33 msgid "Select this option to allow repository creation for this user" -msgstr "Wybierz tę opcję, aby umożliwić stworzenie repozytorium dla tego użytkownika" +msgstr "" +"Wybierz tę opcję, aby umożliwić stworzenie repozytorium dla tego " +"użytkownika" #: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" @@ -4438,7 +4425,9 @@ #: kallithea/templates/base/default_perms_box.html:45 msgid "Select this option to allow user group creation for this user" -msgstr "Wybierz tę opcję, aby umożliwić utworzenie grupy użytkowników dla tego użytkownika" +msgstr "" +"Wybierz tę opcję, aby umożliwić utworzenie grupy użytkowników dla tego " +"użytkownika" #: kallithea/templates/base/default_perms_box.html:52 msgid "Fork repositories" @@ -4446,7 +4435,9 @@ #: kallithea/templates/base/default_perms_box.html:57 msgid "Select this option to allow repository forking for this user" -msgstr "Wybierz tę opcję, aby umożliwić rozwidlania repozytorium dla tego użytkownika" +msgstr "" +"Wybierz tę opcję, aby umożliwić rozwidlania repozytorium dla tego " +"użytkownika" #: kallithea/templates/base/perms_summary.html:13 msgid "show" @@ -4470,84 +4461,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:45 msgid "Add another comment" msgstr "Dodaj kolejny komentarz" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:47 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: kallithea/templates/base/root.html:50 +#: kallithea/templates/base/root.html:48 msgid "Group" msgstr "Grupa" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:49 msgid "members" msgstr "użytkownik" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:50 #: kallithea/templates/pullrequests/pullrequest.html:202 msgid "Loading ..." msgstr "Ładuję..." -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:51 msgid "loading ..." msgstr "ładuję ..." -#: kallithea/templates/base/root.html:54 +#: kallithea/templates/base/root.html:52 msgid "Search truncated" msgstr "Szukaj obcięte" -#: kallithea/templates/base/root.html:55 +#: kallithea/templates/base/root.html:53 msgid "No matching files" msgstr "Nie ma plików pasujących" -#: kallithea/templates/base/root.html:56 +#: 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 "Otwórz nową prośbę o połączenie gałęzi" -#: kallithea/templates/base/root.html:57 +#: kallithea/templates/base/root.html:55 msgid "Open new pull request for selected changesets" msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" -#: kallithea/templates/base/root.html:58 +#: kallithea/templates/base/root.html:56 msgid "Show selected changesets __S -> __E" msgstr "Pokaż wybrane zmiany __S -> __E" +#: kallithea/templates/base/root.html:57 +msgid "Show selected changeset __S" +msgstr "Pokaż wybrane zmiany __S -> __E" + +#: kallithea/templates/base/root.html:58 +msgid "Selection link" +msgstr "Wybór linku" + #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" -msgstr "Pokaż wybrane zmiany __S -> __E" - -#: kallithea/templates/base/root.html:60 -msgid "Selection link" -msgstr "Wybór linku" - -#: kallithea/templates/base/root.html:61 #: kallithea/templates/changeset/diff_block.html:8 msgid "Collapse diff" msgstr "Pliki różnic" -#: kallithea/templates/base/root.html:62 +#: kallithea/templates/base/root.html:60 msgid "Expand diff" msgstr "poprawka różnic" -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/base/root.html:61 msgid "Failed to revoke permission" msgstr "Nie udało się cofnąć uprawnienia" -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/base/root.html:62 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "potwierdzić odwołanie pozwolenie na {0}: {1} ?" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr "" @@ -4861,9 +4852,10 @@ #: 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 "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do użytkownika strony" +msgid "Use @username inside this text to send notification to this Kallithea user" +msgstr "" +"Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do " +"użytkownika strony" #: kallithea/templates/changeset/changeset_file_comment.html:73 #: kallithea/templates/changeset/changeset_file_comment.html:166 @@ -5051,8 +5043,11 @@ #: kallithea/templates/email_templates/pull_request.html:6 #, python-format msgid "" -"%s opened a pull request for repository %s and wants you to review changes." -msgstr "%s zgłosił wniosek połączenia w repozytorium %s i chce żeby sprawdzić zmiany." +"%s opened a pull request for repository %s and wants you to review " +"changes." +msgstr "" +"%s zgłosił wniosek połączenia w repozytorium %s i chce żeby sprawdzić " +"zmiany." #: kallithea/templates/email_templates/pull_request.html:8 #: kallithea/templates/pullrequests/pullrequest.html:31 @@ -5278,7 +5273,9 @@ #: kallithea/templates/files/files_source.html:44 msgid "Editing files allowed only when on branch head revision" -msgstr "Edycja plików dozwolona tylko wtedy, gdy rewizja jest w trakcie rewizji głównej gałęzi" +msgstr "" +"Edycja plików dozwolona tylko wtedy, gdy rewizja jest w trakcie rewizji " +"głównej gałęzi" #: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" @@ -5723,3 +5720,4 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "Porównaj tagi" +
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -1,4 +1,4 @@ -# Translations template for Kallithea. +# Portuguese (Brazil) translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. # Translators: @@ -6,104 +6,107 @@ # gnustavo <gustavo@gnustavo.com>, 2013 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/Kallithea/language/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) " +"(http://www.transifex.com/projects/p/Kallithea/language/pt_BR/)\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"Language: pt_BR\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 + +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "Todos os Ramos" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "(fechado)" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "Mostrar espaços em branco" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "Ignorar espaços em branco" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "Mudança de estado -> %s" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" +"Changing status on a changeset associated with a closed pull request is " +"not allowed" msgstr "Mudar o estado de um changeset associado a um pull request não é permitido" -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "Página inicial" -#: kallithea/controllers/error.py:99 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal formada." - -#: kallithea/controllers/error.py:102 +#: kallithea/controllers/error.py:101 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" +"A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal" +" formada." + +#: kallithea/controllers/error.py:104 msgid "Unauthorized access to resource" msgstr "Acesso não autorizado ao recurso" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "Você não tem permissão para ver esta página" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:108 msgid "The resource could not be found" msgstr "O recurso não pôde ser encontrado" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "O servidor encontrou uma condição inesperada que o impediu de satisfazer a requisição." - -#: kallithea/controllers/feed.py:53 +msgstr "" +"O servidor encontrou uma condição inesperada que o impediu de satisfazer " +"a requisição." + +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "Modificações no repositório %s" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "%s - feed %s" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -113,405 +116,407 @@ msgid "Changeset was too big and was cut off..." msgstr "Conjunto de mudanças era grande demais e foi cortado..." -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "%s commitados em %s" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Clique aqui para adicionar um novo arquivo" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "Este repositório foi travado por %s em %s" -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "Só é possível editar arquivos quando a revisão é um ramo válido" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "Arquivo %s editado via Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "Sem modificações" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "Arquivo adicionado via Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "Nenhum conteúdo" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "Nenhum nome de arquivo" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "O caminho deve ser relativo e não pode conter .." -#: kallithea/controllers/files.py:522 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "Downloads desabilitados" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "Repositório vazio" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "Tipo de arquivo desconhecido" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: kallithea/controllers/files.py:774 -#: kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "Ramos" -#: kallithea/controllers/files.py:775 -#: kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "Etiquetas" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: kallithea/controllers/home.py:81 +#: kallithea/controllers/home.py:86 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "Repositórios" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "Ramo" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "diário público" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "diário" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "Você foi registrado no Kallithea com sucesso" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "" -"Your password reset was successful, new password has been sent to your email" -msgstr "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao seu e-mail" - -#: kallithea/controllers/pullrequests.py:138 +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" +"Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " +"seu e-mail" + +#: kallithea/controllers/pullrequests.py:140 #: kallithea/templates/changeset/changeset.html:13 #: kallithea/templates/email_templates/changeset_comment.html:15 msgid "Changeset" msgstr "Conjunto de Mudanças" -#: kallithea/controllers/pullrequests.py:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "Ramos pares" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:328 +#: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" msgstr "O pull request requer um título com no mínimo três caracteres" -#: kallithea/controllers/pullrequests.py:330 +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "Novo pull request criado com sucesso" -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "Ocorreu um erro durante o envio do pull request" -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "Fechando com" -#: kallithea/controllers/pullrequests.py:520 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" -msgstr "Não é permitido fechar um pull request em um estado diferente de rejeitado ou aprovado" - -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/pullrequests.py:522 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" +"Não é permitido fechar um pull request em um estado diferente de " +"rejeitado ou aprovado" + +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh" -#: kallithea/controllers/search.py:142 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "Ainda não há dados carregados" -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "Configurações padrão atualizadas com sucesso" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "Ocorreu um erro durnge a atualização dos padrões" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "para sempre" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "cinco minutos" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" -msgstr "uma hora" +msgid "forever" +msgstr "para sempre" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" -msgstr "um dia" +msgid "5 minutes" +msgstr "cinco minutos" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "um mês" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "uma hora" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/users.py:292 +msgid "1 day" +msgstr "um dia" + +#: kallithea/controllers/admin/gists.py:64 #: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:293 +msgid "1 month" +msgstr "um mês" + +#: kallithea/controllers/admin/gists.py:68 +#: kallithea/controllers/admin/my_account.py:263 +#: kallithea/controllers/admin/users.py:295 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "Ocorreu um erro durante a criação de um gist" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "Gist %s excluído" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação" -#: kallithea/controllers/admin/my_account.py:125 +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "Ocorreu um erro durante a atualização do usuário %s" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "Email %s adicionado ao usuário" -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante o salvamento do email" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "Email removido do usuário" -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Nenhum" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "Ler" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" -msgstr "Gravar" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +msgid "None" +msgstr "Nenhum" #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 +msgid "Read" +msgstr "Ler" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "Gravar" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -530,467 +535,440 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "Administrador" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 msgid "Disabled" msgstr "Desabilitado" -#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:78 msgid "Allowed with manual account activation" msgstr "Permitido com ativação manual de conta" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "Permitido com ativação automática de conta" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "Habilitado" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "Ocorreu um erro durante a atualização das permissões" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "Grupo de repositórios %s atualizado" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "Esse grupo contém %s repositórios e não pode ser excluído" -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Este grupo contém %s subgrupos e não pode ser excluído" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "Grupo de repositórios %s excluído" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "Você não pode revocar sua própria permissão de administrador" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "Ocorreu um erro durante a revocação das permissões" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "Erro ao criar repositório %s" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "Ocorreu um erro durante a atualização do repositório %s" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "%s bifurcações excluídas" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "Repositório %s excluído" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "Ocorreu um erro durante a criação do campo" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante a remoção do campo" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "Descompasso de Token" -#: kallithea/controllers/admin/repos.py:544 +#: kallithea/controllers/admin/repos.py:546 msgid "Nothing" msgstr "Nada" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "Ocorreu um erro durante o destravamento" -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "Destravado" -#: kallithea/controllers/admin/repos.py:596 +#: kallithea/controllers/admin/repos.py:598 msgid "Locked" msgstr "Travado" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "O repositório foi %s" -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: kallithea/controllers/admin/repos.py:671 +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "Configurações de VCS atualizadas" -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" -#: kallithea/controllers/admin/settings.py:269 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "Ocorreu um erro durante a atualização das configurações de visualização" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "" -"Your license will expire on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "" -"Your license has expired on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:571 -msgid "" -"Unexpected error while reading license key. Please make sure your license " -"token and key are correct" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "Grupo de usuários %s criado" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Ocorreu um erro durante a criação do grupo de usuários %s" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "Grupo de usuários %s atualizado" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "Ocorreu um erro durante a atualização do grupo de usuários %s" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "Grupo de usuários excluído com sucesso" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "Ocorreu um erro durante a exclusão do grupo de usuários" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "O grupo destino não pode ser o mesmo" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "Permissões atualizadas" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante o salvamento das permissões" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "Usuário %s criado" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Ocorreu um erro durante a criação do usuário %s" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "Usuário excluído com sucesso" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "Você não pode editar esse usuário" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "Ocorreu um erro durante o salvamento do IP" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "Você precisa estar logado para ver essa página" -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Arquivo binário" -#: kallithea/lib/diffs.py:80 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Conjunto de mudanças é grande demais e foi cortado, use o menu de diferenças para ver as diferenças" - -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:82 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"Conjunto de mudanças é grande demais e foi cortado, use o menu de " +"diferenças para ver as diferenças" + +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "Nenhuma alteração detectada" @@ -1026,8 +1004,7 @@ msgid "%s more" msgstr "%s mais" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "revisões" @@ -1122,138 +1099,112 @@ msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr " e mais %s" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "Nenhum Arquivo" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "novo arquivo" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "excluir" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "renomear" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, 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 "O repositório %s não está mapeado ao BD. Talvez ele tenha sido criado ou renomeado a partir do sistema de arquivos. Por favor, execute a aplicação outra vez para varrer novamente por repositórios" - -#: kallithea/lib/utils2.py:413 +"%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 "" +"O repositório %s não está mapeado ao BD. Talvez ele tenha sido criado ou " +"renomeado a partir do sistema de arquivos. Por favor, execute a aplicação" +" outra vez para varrer novamente por repositórios" + +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "em %s" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%s ago" msgstr "%s atrás" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:440 #, python-format msgid "in %s and %s" msgstr "em %s e %s" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" msgstr "agora há pouco" -#: 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: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:1659 -msgid "Repository no access" -msgstr "Nenhum acesso ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py: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:1660 -msgid "Repository read access" -msgstr "Acesso de leitura ao repositório" - #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 @@ -1266,8 +1217,8 @@ #: 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 write access" -msgstr "Acesso de escrita ao repositório" +msgid "Repository no access" +msgstr "Nenhum acesso ao repositório" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1186 @@ -1281,159 +1232,159 @@ #: 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 admin access" -msgstr "Acesso administrativo ao repositório" +msgid "Repository read access" +msgstr "Acesso de leitura ao repositório" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" +msgstr "Acesso de escrita ao repositório" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no access" -msgstr "Nenhum acesso ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repositories Group read access" -msgstr "Acesso de leitura ao Grupo de Repositórios" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 +msgid "Repository admin access" +msgstr "Acesso administrativo ao repositório" #: kallithea/lib/dbmigrate/schema/db_1_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 "Repositories Group write access" -msgstr "Acesso de escrita ao Grupo de Repositórios" +msgid "Repositories Group no access" +msgstr "Nenhum acesso ao Grupo de Repositórios" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repositories Group admin access" -msgstr "Acesso administrativo ao Grupo de Repositórios" +msgid "Repositories Group read access" +msgstr "Acesso de leitura ao Grupo de Repositórios" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312 +msgid "Repositories Group write access" +msgstr "Acesso de escrita ao Grupo de Repositórios" #: 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 -#: 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:1657 -msgid "Kallithea Administrator" -msgstr "Administrador do Kallithea" - -#: 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: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:1680 -msgid "Repository creation disabled" -msgstr "Criação de repositórios desabilitada" +msgid "Repositories Group admin access" +msgstr "Acesso administrativo ao Grupo de Repositórios" #: 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: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:1681 -msgid "Repository creation enabled" -msgstr "Criação de repositórios habilitada" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 +msgid "Kallithea Administrator" +msgstr "Administrador do Kallithea" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 +msgid "Repository creation disabled" +msgstr "Criação de repositórios desabilitada" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking disabled" -msgstr "Bifurcação de repositórios desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py: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:1686 -msgid "Repository forking enabled" -msgstr "Bifurcação de repositórios habilitada" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" +msgstr "Criação de repositórios habilitada" #: kallithea/lib/dbmigrate/schema/db_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 -msgid "Register disabled" -msgstr "Registro desabilitado" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" +msgstr "Bifurcação de repositórios desabilitada" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "Bifurcação de repositórios habilitada" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "Registro desabilitado" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 msgid "Register new user with Kallithea with manual activation" msgstr "Registro de novo usuário no Kallithea com ativação manual" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" msgstr "Registro de novo usuário no Kallithea com auto-ativação" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: 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:2210 -msgid "Not Reviewed" -msgstr "Não Revisado" - -#: 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: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:2211 -msgid "Approved" -msgstr "Aprovado" - #: 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:1765 @@ -1446,8 +1397,8 @@ #: 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 "Rejected" -msgstr "Rejeitado" +msgid "Not Reviewed" +msgstr "Não Revisado" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 @@ -1461,45 +1412,51 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 kallithea/model/db.py:2213 +msgid "Approved" +msgstr "Aprovado" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1767 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1842 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1938 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1984 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2044 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2045 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2066 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2105 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2158 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2204 kallithea/model/db.py:2214 +msgid "Rejected" +msgstr "Rejeitado" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1629 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1768 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1843 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1939 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1985 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2045 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2046 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2067 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2106 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2159 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2205 kallithea/model/db.py:2215 msgid "Under Review" msgstr "Sob Revisão" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 msgid "top level" msgstr "nível superior" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 -msgid "Repository group no access" -msgstr "Sem acesso ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 kallithea/model/db.py:1665 -msgid "Repository group read access" -msgstr "Acesso de leitura ao grupo de repositórios" - #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 @@ -1509,8 +1466,8 @@ #: 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 write access" -msgstr "Acesso de escrita ao grupo de repositórios" +msgid "Repository group no access" +msgstr "Sem acesso ao grupo de repositórios" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1521,9 +1478,22 @@ #: 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 admin access" -msgstr "Acesso administrativo ao grupo de repositórios" - +msgid "Repository group read access" +msgstr "Acesso de leitura ao grupo de repositórios" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1397 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1417 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1463 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1520 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1521 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1581 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1631 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1658 kallithea/model/db.py:1668 +msgid "Repository group write access" +msgstr "Acesso de escrita ao grupo de repositórios" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 #: kallithea/lib/dbmigrate/schema/db_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 @@ -1532,19 +1502,8 @@ #: 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 "User group no access" -msgstr "Sem acesso ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 kallithea/model/db.py:1670 -msgid "User group read access" -msgstr "Acesso de leitura ao grupo de usuários" +msgid "Repository group admin access" +msgstr "Acesso administrativo ao grupo de repositórios" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1554,8 +1513,8 @@ #: 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 write access" -msgstr "Acesso de escrita ao grupo de usuários" +msgid "User group no access" +msgstr "Sem acesso ao grupo de usuários" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1565,8 +1524,19 @@ #: 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 admin access" -msgstr "Acesso administrativo ao grupo de usuários" +msgid "User group read access" +msgstr "Acesso de leitura ao grupo de usuários" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" +msgstr "Acesso de escrita ao grupo de usuários" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1576,20 +1546,20 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 kallithea/model/db.py:1674 +msgid "User group admin access" +msgstr "Acesso administrativo ao grupo de usuários" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1425 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1529 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1550 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1589 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1639 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1666 kallithea/model/db.py:1676 msgid "Repository Group creation disabled" msgstr "Criação de Grupo de Repositórios desatilibada" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 kallithea/model/db.py:1675 -msgid "Repository Group creation enabled" -msgstr "Criação de Grupo de Repositórios habilitada" - #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 @@ -1598,42 +1568,31 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 kallithea/model/db.py:1677 +msgid "Repository Group creation enabled" +msgstr "Criação de Grupo de Repositórios habilitada" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1428 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1474 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1553 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1592 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1642 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1669 kallithea/model/db.py:1679 msgid "User Group creation disabled" msgstr "Criação de Grupo de Usuários desabilitada" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 msgid "User Group creation enabled" msgstr "Criação de Grupo de Usuários habilitada" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 -msgid "Registration disabled" -msgstr "Registro desatilitado" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 kallithea/model/db.py:1689 -msgid "User Registration with manual account activation" -msgstr "Registro de Usuário com ativação manual de conta" - #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 @@ -1642,27 +1601,47 @@ #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 kallithea/model/db.py:1690 +msgid "Registration disabled" +msgstr "Registro desatilitado" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1438 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1484 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1541 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1563 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1602 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1654 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1681 kallithea/model/db.py:1691 +msgid "User Registration with manual account activation" +msgstr "Registro de Usuário com ativação manual de conta" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1692 msgid "User Registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:75 +#: 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 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "na linha %s" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "[Menção]" @@ -1688,73 +1667,79 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s comentou no changeset em %(when)s" -#: kallithea/model/notification.py:230 +#: kallithea/model/notification.py:232 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s enviou mensagem em %(when)s" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:233 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s mencionou-o em %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:234 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s registrou-se no Kallithea em %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:235 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s abriu um novo pull request em %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:236 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s comentou no pull request em %(when)s" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "tip mais recente" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "Novo registro de usuário" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" -msgstr "Você não pode Editar esse usuário, pois ele é crucial para toda a aplicação" - -#: kallithea/model/user.py:268 +msgstr "" +"Você não pode Editar esse usuário, pois ele é crucial para toda a " +"aplicação" + +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" -msgstr "Você não pode remover esse usuário, pois ele é crucial para toda a aplicação" - -#: kallithea/model/user.py:274 +msgstr "" +"Você não pode remover esse usuário, pois ele é crucial para toda a " +"aplicação" + +#: 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 "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. Troque os donos ou remova esses repositórios. %s" - -#: kallithea/model/user.py:302 +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" +"usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " +"Troque os donos ou remova esses repositórios. %s" + +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "Link para trocar senha" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "Sua nova senha" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "Sua nova senha no Kallithea: %s" @@ -1775,9 +1760,11 @@ #: kallithea/model/validators.py:124 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" -msgstr "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere alfanumérico" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" +msgstr "" +"Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " +"pontos e hífens e deve iniciar com caractere alfanumérico" #: kallithea/model/validators.py:151 msgid "The input is not valid" @@ -1801,7 +1788,10 @@ msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "O nome de um grupo de usuários só pode conter characters alfa-numéricos, underscores, pontos ou hífens, e deve começar om um caractere alfa-numérico" +msgstr "" +"O nome de um grupo de usuários só pode conter characters alfa-numéricos, " +"underscores, pontos ou hífens, e deve começar om um caractere alfa-" +"numérico" #: kallithea/model/validators.py:218 msgid "Cannot assign this group as parent" @@ -1904,14 +1894,18 @@ #: kallithea/model/validators.py:791 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" -msgstr "O atributo de login LDAP do CN deve ser especificado - isto é o nome do atributo que é equivalente ao 'nome de usuário'" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" +"O atributo de login LDAP do CN deve ser especificado - isto é o nome do " +"atributo que é equivalente ao 'nome de usuário'" #: kallithea/model/validators.py:804 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" -msgstr "As revisões %(revs)s já fazem parte de um pull request ou já setaram o estado" +msgstr "" +"As revisões %(revs)s já fazem parte de um pull request ou já setaram o " +"estado" #: kallithea/model/validators.py:836 msgid "Please enter a valid IPv4 or IpV6 address" @@ -1919,8 +1913,7 @@ #: kallithea/model/validators.py:837 #, python-format -msgid "" -"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" #: kallithea/model/validators.py:870 @@ -1936,6 +1929,10 @@ 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "Painel de Controle" @@ -2057,7 +2054,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2069,7 +2066,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2085,7 +2082,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2097,8 +2094,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 -#: kallithea/templates/base/root.html:73 +#: 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 @@ -2108,7 +2104,7 @@ msgstr "Carregando..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "Entrar" @@ -2123,14 +2119,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 msgid "Username" msgstr "Nome de usuário" #: kallithea/templates/login.html:52 kallithea/templates/register.html:49 #: kallithea/templates/admin/my_account/my_account.html:39 #: kallithea/templates/admin/users/user_add.html:44 -#: kallithea/templates/base/base.html:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "Senha" @@ -2146,7 +2142,7 @@ msgid "Forgot your password ?" msgstr "Esqueceu sua senha ?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "Não possui uma conta ?" @@ -2178,7 +2174,9 @@ #: kallithea/templates/password_reset.html:64 msgid "Password reset link will be send to matching email address" -msgstr "Link de reinicialização de senha será enviado ao endereço de e-mail correspondente" +msgstr "" +"Link de reinicialização de senha será enviado ao endereço de e-mail " +"correspondente" #: kallithea/templates/register.html:5 kallithea/templates/register.html:30 #: kallithea/templates/register.html:106 @@ -2245,7 +2243,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "Diário do administrador" @@ -2307,7 +2305,7 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "" @@ -2330,12 +2328,12 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "" @@ -2369,7 +2367,7 @@ msgstr "Padrões de repositórios" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "Padrões" @@ -2393,7 +2391,9 @@ msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." -msgstr "Repositórios privados são visíveis somente por pessoas explicitamente adicionadas como colaboradores." +msgstr "" +"Repositórios privados são visíveis somente por pessoas explicitamente " +"adicionadas como colaboradores." #: kallithea/templates/admin/defaults/defaults.html:58 #: kallithea/templates/admin/repos/repo_edit_settings.html:91 @@ -2544,7 +2544,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2619,7 +2618,7 @@ msgstr "Mostrar original" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "Minha conta" @@ -2797,8 +2796,8 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:26 msgid "" -"Your user is in an external Source of Record; some details cannot be managed" -" here" +"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 @@ -2848,7 +2847,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2875,7 +2874,7 @@ msgstr "Comentários" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "Pull Requests" @@ -2893,7 +2892,7 @@ msgstr "Mostrar notificação" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "Notificações" @@ -2906,7 +2905,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "Permissões" @@ -2937,9 +2936,12 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" -msgstr "Todas as permissões padrão em cada repositório serão modificadas para a permissão escolhida, note que todas as permissões padrão customizadas nos repositórios serão perdidas" +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" +"Todas as permissões padrão em cada repositório serão modificadas para a " +"permissão escolhida, note que todas as permissões padrão customizadas nos" +" repositórios serão perdidas" #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/permissions/permissions_globals.html:40 @@ -2960,7 +2962,10 @@ "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "Todas as permissões padrão em cada grupo de repositórios serão modificadas para a permissão escolhida, note que todas as permissões padrão customizadas em grupos de repositórios serão perdidas" +msgstr "" +"Todas as permissões padrão em cada grupo de repositórios serão " +"modificadas para a permissão escolhida, note que todas as permissões " +"padrão customizadas em grupos de repositórios serão perdidas" #: kallithea/templates/admin/permissions/permissions_globals.html:46 #: kallithea/templates/data_table/_dt_elements.html:211 @@ -2972,7 +2977,10 @@ "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "Todas as permissões padrão em cada repositório serão reinicializadas para as permissões escolhidas. Note que todas as permissões padrão customizadas nos repositórios serão perdidas" +msgstr "" +"Todas as permissões padrão em cada repositório serão reinicializadas para" +" as permissões escolhidas. Note que todas as permissões padrão " +"customizadas nos repositórios serão perdidas" #: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation" @@ -2984,8 +2992,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to repository groups allows creating repositories inside" +" that group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3033,7 +3041,7 @@ msgstr "Adicionar grupo de repositórios" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "Grupo de repositórios" @@ -3079,8 +3087,7 @@ #: 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:77 -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "Configurações" @@ -3206,9 +3213,11 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" -msgstr "Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os outros grupos e repositórios dentro deles" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" +"Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os" +" outros grupos e repositórios dentro deles" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format @@ -3255,9 +3264,10 @@ #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 #: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." -msgstr "Seja sucinto e objetivo. Use um arquivo README para descrições mais longas." +msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" +"Seja sucinto e objetivo. Use um arquivo README para descrições mais " +"longas." #: kallithea/templates/admin/repos/repo_add_base.html:45 #: kallithea/templates/forks/fork.html:55 @@ -3292,8 +3302,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:30 #, python-format msgid "" -"Repository \"%(repo_name)s\" is beeing created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:42 @@ -3339,7 +3349,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:10 #: kallithea/templates/admin/repos/repo_edit_fork.html:9 msgid "Manually set this repository as a fork of another from the list" -msgstr "Marque manualmente este repositório como uma bifurcação de um outro da lista" +msgstr "" +"Marque manualmente este repositório como uma bifurcação de um outro da " +"lista" #: kallithea/templates/admin/repos/repo_edit_advanced.html:24 msgid "Public journal visibility" @@ -3355,9 +3367,11 @@ #: 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 "Todas as ações feitas nesse repositório serão acessíveis a todos no diário público" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" +"Todas as ações feitas nesse repositório serão acessíveis a todos no " +"diário público" #: kallithea/templates/admin/repos/repo_edit_advanced.html:49 msgid "Change locking" @@ -3385,9 +3399,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:73 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Trigering a pull locks repository by user who pulled, only the same user can" -" unlock by doing a push" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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 @@ -3417,10 +3431,14 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" -msgstr "Este repositório será renomeado de um modo especial para não ser mais acessívei pelo Kallithea ou outros sistemas VCS. Se você precisa excluí-lo totalmente do sistema de arquivos, por favor, faça-o manualmente" +"This repository will be renamed in a special way in order to be " +"unaccesible for Kallithea and VCS systems. If you need to fully delete it" +" from file system please do it manually" +msgstr "" +"Este repositório será renomeado de um modo especial para não ser mais " +"acessívei pelo Kallithea ou outros sistemas VCS. Se você precisa " +"excluí-lo totalmente do sistema de arquivos, por favor, faça-o " +"manualmente" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate repository cache" @@ -3432,9 +3450,11 @@ #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" -msgstr "Invalidar manualmente o cache deste repositório. No próximo acesso o repositório será cacheado novamente" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" +"Invalidar manualmente o cache deste repositório. No próximo acesso o " +"repositório será cacheado novamente" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "List of cached values" @@ -3526,9 +3546,12 @@ #: 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 allways be accessible under such url.\n" -" Usefull 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 above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull 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 @@ -3622,10 +3645,6 @@ msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "" @@ -3708,12 +3727,11 @@ #: kallithea/templates/admin/settings/settings_global.html:50 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" +"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_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3725,8 +3743,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3737,57 +3755,6 @@ msgid "Failed to remove hook" msgstr "Falha ao remover gancho" -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "" -"Please enter following lines (if yet not present) into [app:main] section of" -" your .ini file. The token below is autogenerated." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "Opção de varredura" @@ -3798,8 +3765,9 @@ #: 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." +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3808,8 +3776,8 @@ #: 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." +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 @@ -3818,8 +3786,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallitheas GIT hooks are installed for each repository. Current" +" hooks will be updated to latest version" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3845,6 +3813,10 @@ msgstr "Reindexar" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "" @@ -3934,14 +3906,16 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." -msgstr "Clique para destravar. Você deve reiniciar o Kallithea para que esta configuração tenha efeito." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." +msgstr "" +"Clique para destravar. Você deve reiniciar o Kallithea para que esta " +"configuração tenha efeito." #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this" -" value a restart and rescan of the repository folder are required." +"Filesystem location where repositories should be stored. After changing " +"this value a restart and rescan of the repository folder are required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3971,22 +3945,34 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar url allows you to use other avatar server application.\n" -" Following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:54 @@ -3995,8 +3981,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:58 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:64 @@ -4044,7 +4030,7 @@ msgstr "Adicionar grupo de usuários" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "Grupos de usuários" @@ -4128,7 +4114,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "Usuários" @@ -4198,8 +4184,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4239,50 +4225,50 @@ msgid "Server instance: %s" msgstr "Instância de servidor: %s" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "Sumário" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "Registro de alterações" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "Arquivos" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "Trocar Para" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "Opções" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "Compare bifurcação" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4292,112 +4278,112 @@ msgid "Compare" msgstr "Compare" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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 "Pesquisar" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "Destravar" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "Travar" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "Seguir" -#: kallithea/templates/base/base.html:182 +#: kallithea/templates/base/base.html:185 msgid "Unfollow" msgstr "Parar de seguir" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "Bifurcação" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostrar Pull Requests para %s" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "Não logado" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "Entrar com sua conta" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "Esqueceu a senha ?" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "Sair" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "Mostrar atividade recente" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "Diário" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "Diário público" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "Mostrar gists públicos" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:324 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:327 msgid "Create new gist" msgstr "Criar novo gist" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:328 msgid "All public gists" msgstr "Todos os gists públicos" -#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:330 msgid "My public gists" msgstr "Meus gists públicos" -#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:331 msgid "My private gists" msgstr "Meus gists privados" -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "Buscar nos repositórios" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "" @@ -4408,8 +4394,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4418,7 +4404,9 @@ #: kallithea/templates/base/default_perms_box.html:33 msgid "Select this option to allow repository creation for this user" -msgstr "Selecione esta opção para permitir a criação de repositórios para este usuário" +msgstr "" +"Selecione esta opção para permitir a criação de repositórios para este " +"usuário" #: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" @@ -4426,7 +4414,9 @@ #: kallithea/templates/base/default_perms_box.html:45 msgid "Select this option to allow user group creation for this user" -msgstr "Selecione esta opção para permitir a criação de grupos de usuários para este usuário" +msgstr "" +"Selecione esta opção para permitir a criação de grupos de usuários para " +"este usuário" #: kallithea/templates/base/default_perms_box.html:52 msgid "Fork repositories" @@ -4434,7 +4424,9 @@ #: kallithea/templates/base/default_perms_box.html:57 msgid "Select this option to allow repository forking for this user" -msgstr "Selecione esta opção para permitir a bifurcação de repositórios para este usuário" +msgstr "" +"Selecione esta opção para permitir a bifurcação de repositórios para este" +" usuário" #: kallithea/templates/base/perms_summary.html:13 msgid "show" @@ -4458,84 +4450,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:45 msgid "Add another comment" msgstr "Adicionar outro comentário" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:47 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: kallithea/templates/base/root.html:50 +#: kallithea/templates/base/root.html:48 msgid "Group" msgstr "Grupo" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:49 msgid "members" msgstr "membros" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:50 #: kallithea/templates/pullrequests/pullrequest.html:202 msgid "Loading ..." msgstr "Carregando..." -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:51 msgid "loading ..." msgstr "carregando ..." -#: kallithea/templates/base/root.html:54 +#: kallithea/templates/base/root.html:52 msgid "Search truncated" msgstr "Busca truncada" -#: kallithea/templates/base/root.html:55 +#: kallithea/templates/base/root.html:53 msgid "No matching files" msgstr "Nenhum arquivo encontrado" -#: kallithea/templates/base/root.html:56 +#: 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 "Crie novo pull request" -#: kallithea/templates/base/root.html:57 +#: kallithea/templates/base/root.html:55 msgid "Open new pull request for selected changesets" msgstr "Abrir novo pull request para os changesets selecionados" -#: kallithea/templates/base/root.html:58 +#: kallithea/templates/base/root.html:56 msgid "Show selected changesets __S -> __E" msgstr "Mostrar changesets selecionados __S -> __E" +#: kallithea/templates/base/root.html:57 +msgid "Show selected changeset __S" +msgstr "Mostrar changesets selecionados __S" + +#: kallithea/templates/base/root.html:58 +msgid "Selection link" +msgstr "Link da seleção" + #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" -msgstr "Mostrar changesets selecionados __S" - -#: kallithea/templates/base/root.html:60 -msgid "Selection link" -msgstr "Link da seleção" - -#: kallithea/templates/base/root.html:61 #: kallithea/templates/changeset/diff_block.html:8 msgid "Collapse diff" msgstr "Colapsar diff" -#: kallithea/templates/base/root.html:62 +#: kallithea/templates/base/root.html:60 msgid "Expand diff" msgstr "Expandir diff" -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/base/root.html:61 msgid "Failed to revoke permission" msgstr "Falhou ao revocar a permissão" -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/base/root.html:62 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "confirme para revogar permissão para {0}: {1} ?" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr "" @@ -4614,7 +4606,9 @@ msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" -msgstr "Estado do changeset: %s\nClique para abrir os pull request #%s associado" +msgstr "" +"Estado do changeset: %s\n" +"Clique para abrir os pull request #%s associado" #: kallithea/templates/changelog/changelog.html:86 #: kallithea/templates/compare/compare_cs.html:18 @@ -4794,7 +4788,9 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:178 #: kallithea/templates/pullrequests/pullrequest_show.html:202 msgid "Showing a huge diff might take some time and resources" -msgstr "Mostrar um diff muito grande pode levar muito tempo e gastar muitos recursos" +msgstr "" +"Mostrar um diff muito grande pode levar muito tempo e gastar muitos " +"recursos" #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 @@ -4844,9 +4840,10 @@ #: 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 "Use @nomedeusuário dentro desse texto para enviar notificação a este usuário do Kallithea" +msgid "Use @username inside this text to send notification to this Kallithea user" +msgstr "" +"Use @nomedeusuário dentro desse texto para enviar notificação a este " +"usuário do Kallithea" #: kallithea/templates/changeset/changeset_file_comment.html:73 #: kallithea/templates/changeset/changeset_file_comment.html:166 @@ -5033,7 +5030,8 @@ #: 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." +"%s opened a pull request for repository %s and wants you to review " +"changes." msgstr "%s abriu um pull request para o repositório %s e espera sua revisão." #: kallithea/templates/email_templates/pull_request.html:8 @@ -5259,7 +5257,9 @@ #: kallithea/templates/files/files_source.html:44 msgid "Editing files allowed only when on branch head revision" -msgstr "A edição de arquivos só é permitida quando se está na revisão mais recente do ramo" +msgstr "" +"A edição de arquivos só é permitida quando se está na revisão mais " +"recente do ramo" #: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" @@ -5703,3 +5703,4 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "Comparar tags" +
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -1,125 +1,119 @@ -# Translations template for Kallithea. +# Russian translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. # Translators: # ArcheR <aleclitvinov1980@gmail.com>, 2013 # mokeev1995 <mokeev_andre@mail.ru>, 2013 # Andrey Mivrenik <myvrenik@gmail.com>, 2013 -# ArcheR <aleclitvinov1980@gmail.com>, 2013 # invision70 <invision70@gmail.com>, 2014 # ivlevdenis <ivlevdenis.ru@gmail.com>, 2013 -# ivlevdenis <ivlevdenis.ru@gmail.com>, 2013 # Mikhail Zholobov <legal90@gmail.com>, 2013 -# Mikhail Zholobov <legal90@gmail.com>, 2013 -# mokeev1995 <mokeev_andre@mail.ru>, 2013 -# Andrey Mivrenik <myvrenik@gmail.com>, 2013 -# Ruslan Bekenev <furyinbox@gmail.com>, 2013 # Ruslan Bekenev <furyinbox@gmail.com>, 2013 # SkryabinD <skryabind@gmail.com>, 2014 # softforwinxp <softforwinxp@gmail.com>, 2013 -# softforwinxp <softforwinxp@gmail.com>, 2013 # zhmylove <zhmylove@narod.ru>, 2013 -# Mikhail Zholobov <legal90@gmail.com>, 2013 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" -"Language-Team: Russian (http://www.transifex.com/projects/p/Kallithea/language/ru/)\n" +"Language-Team: Russian " +"(http://www.transifex.com/projects/p/Kallithea/language/ru/)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "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" -"Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 + +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "Ещё не было изменений" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "Все ветки" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "(закрыто)" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "Отображать пробелы" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "Игнорировать пробелы" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "Изменение статуса -> %s" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "Нельзя редактировать статус изменений, связанных с закрытыми pull-request'ами." - -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +"Changing status on a changeset associated with a closed pull request is " +"not allowed" +msgstr "" +"Нельзя редактировать статус изменений, связанных с закрытыми pull-" +"request'ами." + +#: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 msgid "Select changeset" msgstr "Выбрать набор изменений" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "Домашняя страница" -#: kallithea/controllers/error.py:99 -msgid "" -"The request could not be understood by the server due to malformed syntax." +#: kallithea/controllers/error.py:101 +msgid "The request could not be understood by the server due to malformed syntax." msgstr "Запрос не распознан сервером из-за неправильного синтаксиса." -#: kallithea/controllers/error.py:102 +#: kallithea/controllers/error.py:104 msgid "Unauthorized access to resource" msgstr "Несанкционированный доступ к ресурсу" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "У вас нет прав для просмотра этой страницы" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:108 msgid "The resource could not be found" msgstr "Ресурс не найден" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "Сервер не может выполнить запрос, из-за неправильного условия в запросе" -#: kallithea/controllers/feed.py:53 +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "Изменения в репозитарии %s" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "Лента новостей %s %s" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -129,405 +123,411 @@ msgid "Changeset was too big and was cut off..." msgstr "Изменения оказались слишком большими и были вырезаны..." -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "%s выполнил commit в %s" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Нажмите чтобы добавить новый файл" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "Репозиторий заблокировал %s в %s" -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "Во время фиксации изменений произошла ошибка" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " -msgstr "Вы можете редактировать файлы только в редакции, связанной с существующей веткой" - -#: kallithea/controllers/files.py:385 +msgstr "" +"Вы можете редактировать файлы только в редакции, связанной с существующей" +" веткой" + +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s отредактирован с помощью Kallithea" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "Без изменений" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "Изменения применены в %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "Файл добавлен с помощью Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "Пусто" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "Безымянный" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" -msgstr "Расположение должно быть относительным путем, и не должно содержать \"..\" в пути" - -#: kallithea/controllers/files.py:522 +msgstr "" +"Расположение должно быть относительным путем, и не должно содержать " +"\"..\" в пути" + +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "Возможность скачивать отключена" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "Неизвестная версия %s" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "Пустой репозитарий" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "Неизвестный тип архива" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "Набор изменений" -#: kallithea/controllers/files.py:774 -#: kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "Ветки" -#: kallithea/controllers/files.py:775 -#: kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "Метки" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "Произошла ошибка во время создания форка репозитория %s" -#: kallithea/controllers/home.py:81 +#: kallithea/controllers/home.py:86 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "Репозитории" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "Ветка" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "Тэги" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "Закладки" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "общедоступный журнал" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "журнал" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "Регистрация в Kallithea прошла успешно" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "Ссылка для сброса пароля отправлена" -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "" -"Your password reset was successful, new password has been sent to your email" +"Your password reset was successful, new password has been sent to your " +"email" msgstr "Сброс пароля прошел успешно, новый пароль был отправлен на ваш email" -#: kallithea/controllers/pullrequests.py:138 +#: 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:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "Специальный" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "Ветки участника" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "Закладки" -#: kallithea/controllers/pullrequests.py:328 +#: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" msgstr "Заголовок Pull запроса должен быть не менее 3-х символов" -#: kallithea/controllers/pullrequests.py:330 +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "Ошибка при создании pull запроса: %s" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "Pull запрос создан успешно" -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "Произошла ошибка при создании Pull запроса" -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "Pull запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "Закрытый с" -#: kallithea/controllers/pullrequests.py:520 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" -msgstr "Закрытие pull-requst'а со статусом, отличным от 'Одобрено' или 'Отклонено' " - -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/pullrequests.py:522 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" +"Закрытие pull-requst'а со статусом, отличным от 'Одобрено' или " +"'Отклонено' " + +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "Недопустимый поисковый запрос. Попробуйте заключить его в кавычки." -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh." -#: kallithea/controllers/search.py:142 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "Произошла ошибка при выполнении этого поиска" -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "Данные пока не загружены" -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "Статистические данные отключены для этого репозитария" -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "Настройки авторизации успешно обновлены" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "произошла ошибка при обновлении настроек авторизации" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "Стандартные настройки успешно обновлены" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "Произошла ошибка при обновлении стандартных настроек" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "навсегда" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "5 минут" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" -msgstr "1 час" +msgid "forever" +msgstr "навсегда" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" -msgstr "1 день" +msgid "5 minutes" +msgstr "5 минут" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "1 месяц" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "1 час" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: kallithea/controllers/admin/users.py:292 +msgid "1 day" +msgstr "1 день" + +#: kallithea/controllers/admin/gists.py:64 #: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:293 +msgid "1 month" +msgstr "1 месяц" + +#: kallithea/controllers/admin/gists.py:68 +#: kallithea/controllers/admin/my_account.py:263 +#: kallithea/controllers/admin/users.py:295 msgid "Lifetime" msgstr "Срок" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "Произошла ошибка во время создания сути" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "Запись gist %s удалена" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" -msgstr "Вы не можете изменить данные пользователя, поскольку это критично для работы всего приложения" - -#: kallithea/controllers/admin/my_account.py:125 +msgstr "" +"Вы не можете изменить данные пользователя, поскольку это критично для " +"работы всего приложения" + +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "Ваша учетная запись успешно обновлена" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "Произошла ошибка при обновлении пользователя %s" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "Пользователю добавлен E-mail %s" -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "Произошла ошибка при сохранении E-mail" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "E-mail пользователя удалён" -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "Ничего" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "Чтение" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" -msgstr "Запись" +#: 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 +msgid "Read" +msgstr "Чтение" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "Запись" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -546,467 +546,442 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "Администратор" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 msgid "Disabled" msgstr "Отключено" -#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:78 msgid "Allowed with manual account activation" msgstr "Разрешена, с ручной активацией учётной записи" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "Разрешена, с автоматической активацией учётной записи" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "Автоматическая активация внешней учетной записи" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "Включено" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Глобальные привилегии успешно обновлены" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "Произошла ошибка во время обновления привилегий" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "Создана новая группа репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Произошла ошибка при создании группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "Группа репозиториев %s обновлена" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Произошла ошибка при обновлении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "Данная группа содержит %s репозитариев и не может быть удалена" -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Группа содержит в себе %s подгрупп и не может быть удалён" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "Группа репозиториев %s удалена" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Произошла ошибка при удалении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "Администратор не может отозвать свои привелегии" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "Привилегии группы репозиториев обновлены" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "Произошла ошибка при отзыве привелегии" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "Произошла ошибка при создании репозитория %s" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "Репозиторий %s создан из %s" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "Сделан форк(копия) репозитория %s на %s" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "Репозиторий %s создан" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "Репозитарий %s успешно обновлён" -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "Произошла ошибка во время обновления репозитория %s" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "Форки %s отсоединены" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "Удалены форки репозитория %s" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "Репозиторий %s удалён" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Невозможно удалить %s, он всё-ещё содержит форки" -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "Произошла ошибка во время удаления %s" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "Привилегии репозитория обновлены" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "Произошла ошибка при создании поля" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "Произошла ошибка при удалении поля" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "Видимость репозитория в публичном журнале обновлена" -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" msgstr "Произошла ошибка при установке репозитария в общедоступный журнал" -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "Несовпадение токенов" -#: kallithea/controllers/admin/repos.py:544 +#: kallithea/controllers/admin/repos.py:546 msgid "Nothing" msgstr "Ничего" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Репозиторий %s отмечен как форк %s" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "Произошла ошибка при выполнении операции" -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "Закрытый репозиторий" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "Открытый репозиторий" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "Произошла ошибка во время разблокирования" -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "Разблокировано" -#: kallithea/controllers/admin/repos.py:596 +#: kallithea/controllers/admin/repos.py:598 msgid "Locked" msgstr "Заблокировано" -#: kallithea/controllers/admin/repos.py:598 +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "Репозиторий %s" -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "Произошла ошибка при очистке кэша" -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "Внесены изменения из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" msgstr "Произошла ошибка при внесении изменений из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:671 +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "Произошла ошибка при удалении статистики репозитория" -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "Обновлены настройки VCS" -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s" -#: kallithea/controllers/admin/settings.py:269 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "Произошла ошибка при обновлении настроек визуализации" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "Добавлена новая ловушка" -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "произошла ошибка при создании хука" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "Запланирована переиндексация базы Whoosh" -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "Обновленная информация о лицензии" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "Во время обновления лицензии произошла ошибка" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "" -"Your license will expire on %s, please contact support to extend your " -"license." -msgstr "Ваша лицензия истекает %s, пожалуйста, свяжитесь с поддержкой для продления вашей лицензии." - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "" -"Your license has expired on %s, please contact support to extend your " -"license." -msgstr "Ваша лицензия истекла %s, пожалуйста, свяжитесь с поддержкой для продления вашей лицензии." - -#: kallithea/controllers/admin/settings.py:571 -msgid "" -"Unexpected error while reading license key. Please make sure your license " -"token and key are correct" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "Создана группа пользователей %s" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Произошла ошибка при создании группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "Группа пользователей %s обновлена" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "Произошла ошибка при обновлении группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "Группа пользователей успешно удалена" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "Произошла ошибка при удалении группы пользователей" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "Целевая группа не может быть такой же" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "Привилегии группы пользователей обновлены" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "Обновлены привилегии" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "Произошла ошибка при сохранении привилегий" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "Пользователь %s создан" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "Произошла ошибка при создании пользователя %s" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "Пользователь успешно обновлён" -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "Пользователь успешно удалён" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "Произошла ошибка при удалении пользователя" -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "Вы не можете редактировать данного пользователя" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "Добавлен IP %s в белый список пользователя" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "Произошла ошибка при сохранении IP" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "Удален IP %s из белого списка пользователя" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" -msgstr "Вы должны быть зарегистрированным пользователем, чтобы выполнить это действие" - -#: kallithea/lib/auth.py:844 +msgstr "" +"Вы должны быть зарегистрированным пользователем, чтобы выполнить это " +"действие" + +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "Страница доступна только авторизованным пользователям" -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Двоичный файл" -#: kallithea/lib/diffs.py:80 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Набор изменения оказался слишком большими и был урезан, используйте меню сравнения для показа результата сравнения" - -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:82 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"Набор изменения оказался слишком большими и был урезан, используйте меню " +"сравнения для показа результата сравнения" + +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "Изменений не обнаружено" @@ -1042,8 +1017,7 @@ msgid "%s more" msgstr "на %s больше" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "версии" @@ -1138,43 +1112,47 @@ msgid "[stopped following] repository" msgstr "[удалён из наблюдения] репозиторий" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr "и на %s больше" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "Файлов нет" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "новый файл" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "удалить" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "переименовать" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, 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 "Репозиторий %s отсутствует в базе данных; возможно, он был создан или переименован из файловой системы. Пожалуйста, перезапустите приложение для сканирования репозиториев." - -#: kallithea/lib/utils2.py:413 +"%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 "" +"Репозиторий %s отсутствует в базе данных; возможно, он был создан или " +"переименован из файловой системы. Пожалуйста, перезапустите приложение " +"для сканирования репозиториев." + +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1182,7 +1160,7 @@ msgstr[1] "%d лет" msgstr[2] "%d года" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1190,7 +1168,7 @@ msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1198,7 +1176,7 @@ msgstr[1] "%d дня" msgstr[2] "%d дней" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1206,7 +1184,7 @@ msgstr[1] "%d часов" msgstr[2] "%d часа" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1214,7 +1192,7 @@ msgstr[1] "%d минут" msgstr[2] "%d минуты" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1222,60 +1200,30 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунды" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "в %s" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:440 #, python-format msgid "in %s and %s" msgstr "в %s и %s" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "%s и %s назад" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" 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: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:1659 -msgid "Repository no 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: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:1660 -msgid "Repository read 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:1305 @@ -1288,8 +1236,8 @@ #: 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 write access" -msgstr "Репозитарий - доступ на запись" +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 @@ -1303,159 +1251,159 @@ #: 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 admin access" -msgstr "Репозитарий - администрирование" +msgid "Repository read access" +msgstr "Репозитарий - доступ на чтение" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" +msgstr "Репозитарий - доступ на запись" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no 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:1309 -msgid "Repositories Group read access" -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:1664 +msgid "Repository admin 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 "Repositories Group write access" -msgstr "Группа Репозиториев - доступ на запись" +msgid "Repositories 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 "Repositories Group admin access" -msgstr "Группа Репозиториев - администрирование" +msgid "Repositories Group read 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 "Repositories Group write access" +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 -#: 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:1657 -msgid "Kallithea Administrator" -msgstr "Администратор Kallithea " - -#: 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: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:1680 -msgid "Repository creation disabled" -msgstr "Создание репозиториев отключено" +msgid "Repositories Group admin access" +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: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:1681 -msgid "Repository creation enabled" -msgstr "Создание репозиториев включено" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 +msgid "Kallithea Administrator" +msgstr "Администратор Kallithea " #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 +msgid "Repository creation disabled" +msgstr "Создание репозиториев отключено" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking 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: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:1686 -msgid "Repository forking enabled" -msgstr "Возможность создавать форк репозитория включена" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" +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 -msgid "Register disabled" -msgstr "Регистрация отключена" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" +msgstr "Возможность создавать форк репозитория отключена" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "Возможность создавать форк репозитория включена" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "Регистрация отключена" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1321 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1406 msgid "Register new user with Kallithea with manual activation" msgstr "Регистрация нового пользователя в Kallithea с ручной активацией" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" msgstr "Регистрация нового пользователя в Kallithea с автоматической активацией" -#: 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: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:2210 -msgid "Not Reviewed" -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: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:2211 -msgid "Approved" -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:1765 @@ -1468,8 +1416,8 @@ #: 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 "Rejected" -msgstr "Отклонено" +msgid "Not Reviewed" +msgstr "Не просмотрено" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 @@ -1483,45 +1431,51 @@ #: 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 msgid "Under Review" msgstr "На рассмотрении" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 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:1664 -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:1665 -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 @@ -1531,8 +1485,8 @@ #: 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 write access" -msgstr "Группа репозиториев - доступ на запись" +msgid "Repository group no access" +msgstr "Группа Репозиториев - нет доступа" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 @@ -1543,9 +1497,22 @@ #: 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 admin access" -msgstr "Группа репозиториев - администрирование" - +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_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 @@ -1554,19 +1521,8 @@ #: 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 "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:1670 -msgid "User group read access" -msgstr "Группа пользователей - доступ на чтение" +msgid "Repository group admin access" +msgstr "Группа репозиториев - администрирование" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 @@ -1576,8 +1532,8 @@ #: 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 write access" -msgstr "Группа пользователей - доступ на запись" +msgid "User group no access" +msgstr "Группа пользователей - нет доступа" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 @@ -1587,8 +1543,19 @@ #: 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 admin access" -msgstr "Группа пользователей - администрирование" +msgid "User group read access" +msgstr "Группа пользователей - доступ на чтение" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" +msgstr "Группа пользователей - доступ на запись" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 @@ -1598,20 +1565,20 @@ #: 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 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:1675 -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 @@ -1620,42 +1587,31 @@ #: 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 msgid "User Group creation disabled" msgstr "Создание групп пользователей отключено" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 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:1688 -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:1689 -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 @@ -1664,27 +1620,47 @@ #: 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 msgid "User Registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:75 +#: 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 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "на строке %s" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "[Упоминание]" @@ -1710,73 +1686,79 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s оставил комментарий к набору изменений %(when)s" -#: kallithea/model/notification.py:230 +#: kallithea/model/notification.py:232 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s отправил сообщение %(when)s" -#: kallithea/model/notification.py:231 +#: kallithea/model/notification.py:233 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s упомянул вас %(when)s" -#: kallithea/model/notification.py:232 +#: kallithea/model/notification.py:234 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s зарегистрировался в Kallithea %(when)s" -#: kallithea/model/notification.py:233 +#: kallithea/model/notification.py:235 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s открыл новый pull request %(when)s" -#: kallithea/model/notification.py:234 +#: kallithea/model/notification.py:236 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s оставил комментарий к pull request %(when)s" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "последняя версия" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "Регистрация нового пользователя" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" -msgstr "Вы не можете редактировать пользователя, поскольку это критично для работы всего приложения" - -#: kallithea/model/user.py:268 +msgstr "" +"Вы не можете редактировать пользователя, поскольку это критично для " +"работы всего приложения" + +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" -msgstr "Вы не можете удалить пользователя, поскольку это критично для работы всего приложения" - -#: kallithea/model/user.py:274 +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 "пользователь \"%s\" является владельцем репозиториев %s и поэтому не может быть удалён. Смените владельца или удалите данные репозитории. %s" - -#: kallithea/model/user.py:302 +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" +"пользователь \"%s\" является владельцем репозиториев %s и поэтому не " +"может быть удалён. Смените владельца или удалите данные репозитории. %s" + +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "Ваш новый пароль" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "Ваш новый пароль от Kallithea: %s" @@ -1797,9 +1779,12 @@ #: kallithea/model/validators.py:124 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" -msgstr "Имя пользователя может содержать только буквы, цифры, символы подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры либо с символа подчеркивания" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" +msgstr "" +"Имя пользователя может содержать только буквы, цифры, символы " +"подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры " +"либо с символа подчеркивания" #: kallithea/model/validators.py:151 msgid "The input is not valid" @@ -1823,7 +1808,9 @@ msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "имя группы пользователей может содержать только буквы, цифры, символы подчеркивания, точки и тире; а так же должно начинаться с буквы или цифры" +msgstr "" +"имя группы пользователей может содержать только буквы, цифры, символы " +"подчеркивания, точки и тире; а так же должно начинаться с буквы или цифры" #: kallithea/model/validators.py:218 msgid "Cannot assign this group as parent" @@ -1889,7 +1876,9 @@ #: kallithea/model/validators.py:494 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "Неверная ссылка клонирования, предоставьте действительную ссылку для клонирования - http(s)/svn+http(s)." +msgstr "" +"Неверная ссылка клонирования, предоставьте действительную ссылку для " +"клонирования - http(s)/svn+http(s)." #: kallithea/model/validators.py:519 msgid "Fork have to be the same type as parent" @@ -1926,14 +1915,18 @@ #: kallithea/model/validators.py:791 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" -msgstr "Для входа по LDAP должно быть указано значение аттрибута CN - это эквивалент имени пользователя" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" +"Для входа по LDAP должно быть указано значение аттрибута CN - это " +"эквивалент имени пользователя" #: kallithea/model/validators.py:804 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" -msgstr "Ревизии %(revs)s уже включены в pull-request или имеют установленный статус" +msgstr "" +"Ревизии %(revs)s уже включены в pull-request или имеют установленный " +"статус" #: kallithea/model/validators.py:836 msgid "Please enter a valid IPv4 or IpV6 address" @@ -1941,13 +1934,16 @@ #: kallithea/model/validators.py:837 #, python-format -msgid "" -"The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - неверно)" +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" +"Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - " +"неверно)" #: kallithea/model/validators.py:870 msgid "Key name can only consist of letters, underscore, dash or numbers" -msgstr "Ключевое имя может только состоять из букв, символа подчеркивания, тире или чисел" +msgstr "" +"Ключевое имя может только состоять из букв, символа подчеркивания, тире " +"или чисел" #: kallithea/model/validators.py:884 msgid "Filename cannot be inside a directory" @@ -1958,6 +1954,10 @@ 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "Панель управления" @@ -2079,7 +2079,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2091,7 +2091,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2107,7 +2107,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2119,8 +2119,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 -#: kallithea/templates/base/root.html:73 +#: 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 @@ -2130,7 +2129,7 @@ msgstr "Загрузка..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "Войти" @@ -2145,14 +2144,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 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:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "Пароль" @@ -2168,7 +2167,7 @@ msgid "Forgot your password ?" msgstr "Забыли пароль?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "Нет аккаунта?" @@ -2267,7 +2266,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "Журнал администратора" @@ -2330,7 +2329,7 @@ msgstr "Настройки аутентификации" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "Аутентификация" @@ -2346,19 +2345,21 @@ msgid "" "Comma separated list of plugins. Order of plugins is also order in which " "Kallithea will try to authenticate user" -msgstr "Список плагинов, разделенных запятой. Kallithea будет пробовать аутентифицировать пользователя в порядке указания плагинов." +msgstr "" +"Список плагинов, разделенных запятой. Kallithea будет пробовать " +"аутентифицировать пользователя в порядке указания плагинов." #: 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:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "" @@ -2392,7 +2393,7 @@ msgstr " Значения по умолчанию" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "Значения по умолчанию" @@ -2567,7 +2568,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2642,7 +2642,7 @@ msgstr "Показать без форматирования" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "Мой аккаунт" @@ -2820,8 +2820,8 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:26 msgid "" -"Your user is in an external Source of Record; some details cannot be managed" -" here" +"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 @@ -2871,7 +2871,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2898,7 +2898,7 @@ msgstr "Комментарии" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "Pull-request'ы" @@ -2916,7 +2916,7 @@ msgstr "Показать уведомление" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "Уведомления" @@ -2929,7 +2929,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "Привилегии" @@ -2960,9 +2960,12 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" -msgstr "Выбранные привилегии будут установлены по умолчанию для каждого репозитория. Учтите, что ранее установленные привилегии по умолчанию будут сброшены." +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" +"Выбранные привилегии будут установлены по умолчанию для каждого " +"репозитория. Учтите, что ранее установленные привилегии по умолчанию " +"будут сброшены." #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/permissions/permissions_globals.html:40 @@ -2983,7 +2986,10 @@ "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "Выбранные привилегии будут установлены по умолчанию для каждой группы репозиториев. Учтите, что ранее установленные привилегии по умолчанию для групп репозиториев будут сброшены." +msgstr "" +"Выбранные привилегии будут установлены по умолчанию для каждой группы " +"репозиториев. Учтите, что ранее установленные привилегии по умолчанию для" +" групп репозиториев будут сброшены." #: kallithea/templates/admin/permissions/permissions_globals.html:46 #: kallithea/templates/data_table/_dt_elements.html:211 @@ -2995,7 +3001,10 @@ "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "Выбранные привилегии будут установлены по умолчанию для каждой группы пользователей. Учтите, что ранее установленные привилегии по умолчанию для групп пользователей будут сброшены." +msgstr "" +"Выбранные привилегии будут установлены по умолчанию для каждой группы " +"пользователей. Учтите, что ранее установленные привилегии по умолчанию " +"для групп пользователей будут сброшены." #: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation" @@ -3007,8 +3016,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to repository groups allows creating repositories inside" +" that group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3056,7 +3065,7 @@ msgstr "Добавить группу репозиториев" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "Группы репозиториев" @@ -3102,8 +3111,7 @@ #: 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:77 -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "Настройки" @@ -3230,9 +3238,11 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" -msgstr "Включить lock-by-pulling для группы. Эта опция будет применена ко всем дочерним группам и репозиториям" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" +"Включить lock-by-pulling для группы. Эта опция будет применена ко всем " +"дочерним группам и репозиториям" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format @@ -3279,8 +3289,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 #: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Короткое и осмысленное. Для развернутого описания используйте файл README." #: kallithea/templates/admin/repos/repo_add_base.html:45 @@ -3316,8 +3325,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:30 #, python-format msgid "" -"Repository \"%(repo_name)s\" is beeing created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:42 @@ -3379,9 +3388,11 @@ #: 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 "Все производимые с этим репозиторием действия будут отображаться в общедостпном журнале " +"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" @@ -3409,9 +3420,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:73 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Trigering a pull locks repository by user who pulled, only the same user can" -" unlock by doing a push" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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 @@ -3442,10 +3453,14 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" -msgstr "Этот репозитарий будет переименован таким образом, чтобы сделать его недоступным для Kallithea и систем управления версиями. Если вам необходимо полностью удалить его из файловой системы, пожалуйста, сделайте это вручную" +"This repository will be renamed in a special way in order to be " +"unaccesible for Kallithea and VCS systems. If you need to fully delete it" +" from file system please do it manually" +msgstr "" +"Этот репозитарий будет переименован таким образом, чтобы сделать его " +"недоступным для Kallithea и систем управления версиями. Если вам " +"необходимо полностью удалить его из файловой системы, пожалуйста, " +"сделайте это вручную" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate repository cache" @@ -3457,8 +3472,8 @@ #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" msgstr "Ручной сброс кэша репозитория. При первом доступе кэш восстановится." #: kallithea/templates/admin/repos/repo_edit_caches.html:12 @@ -3551,9 +3566,12 @@ #: 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 allways be accessible under such url.\n" -" Usefull 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 above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull 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 @@ -3588,7 +3606,9 @@ #: 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 "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при скачивании" +msgstr "" +"Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " +"скачивании" #: kallithea/templates/admin/repos/repo_edit_settings.html:65 msgid "Change owner of this repository." @@ -3647,10 +3667,6 @@ msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "" @@ -3733,12 +3749,11 @@ #: kallithea/templates/admin/settings/settings_global.html:50 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" +"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_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3750,8 +3765,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3762,57 +3777,6 @@ msgid "Failed to remove hook" msgstr "Не удалось удалить хук" -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "" -"Please enter following lines (if yet not present) into [app:main] section of" -" your .ini file. The token below is autogenerated." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "Опции пересканирования" @@ -3823,8 +3787,9 @@ #: 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." +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3833,8 +3798,8 @@ #: 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." +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 @@ -3843,8 +3808,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallitheas GIT hooks are installed for each repository. Current" +" hooks will be updated to latest version" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3870,6 +3835,10 @@ msgstr "Перестроить индекс" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "" @@ -3959,14 +3928,16 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." -msgstr "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки Kallithea." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." +msgstr "" +"Нажмите для разблокирования. Изменения вступят в силу после перезагрузки " +"Kallithea." #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this" -" value a restart and rescan of the repository folder are required." +"Filesystem location where repositories should be stored. After changing " +"this value a restart and rescan of the repository folder are required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3996,22 +3967,34 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar url allows you to use other avatar server application.\n" -" Following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:54 @@ -4020,8 +4003,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:58 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:64 @@ -4069,7 +4052,7 @@ msgstr "Добавить группу пользователей" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "Группы пользователей" @@ -4153,7 +4136,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "Пользователи" @@ -4223,8 +4206,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4264,50 +4247,50 @@ msgid "Server instance: %s" msgstr "Экземпляр сервера: %s" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "Общие сведения" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "История изменений" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "Файлы" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "Переключиться на" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "Опции" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "Сравнить форк" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4317,112 +4300,112 @@ msgid "Compare" msgstr "Сравнить" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "Разблокировать" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "Заблокировать" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "Наблюдать" -#: kallithea/templates/base/base.html:182 +#: kallithea/templates/base/base.html:185 msgid "Unfollow" msgstr "Не наблюдать" -#: kallithea/templates/base/base.html:185 +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "Показать pull-request'ы для %s" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "Не авторизован" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "Авторизоваться" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "Забыли пароль?" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "Выход" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "Показать последнюю активность" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "Журнал" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "Общедоступный журнал" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "Показать публичные записи" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:324 msgid "Gists" msgstr "Gist" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:327 msgid "Create new gist" msgstr "Создать новую запись" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:328 msgid "All public gists" msgstr "Все публичные записи" -#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:330 msgid "My public gists" msgstr "Мои публичные записи" -#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:331 msgid "My private gists" msgstr "Мои приватные записи" -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "Поиск по репозиториям" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "" @@ -4433,8 +4416,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4459,7 +4442,9 @@ #: kallithea/templates/base/default_perms_box.html:57 msgid "Select this option to allow repository forking for this user" -msgstr "Выберите эту опцию чтобы разрешить данному пользователю создавать fork'и репозиториев" +msgstr "" +"Выберите эту опцию чтобы разрешить данному пользователю создавать fork'и " +"репозиториев" #: kallithea/templates/base/perms_summary.html:13 msgid "show" @@ -4483,84 +4468,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:45 msgid "Add another comment" msgstr "Добавить другой комментарий" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "Отменить наблюдение за репозиторием" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:47 msgid "Start following this repository" msgstr "Наблюдать за репозиторием" -#: kallithea/templates/base/root.html:50 +#: kallithea/templates/base/root.html:48 msgid "Group" msgstr "Группа" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:49 msgid "members" msgstr "участники" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:50 #: kallithea/templates/pullrequests/pullrequest.html:202 msgid "Loading ..." msgstr "Загрузка..." -#: kallithea/templates/base/root.html:53 +#: kallithea/templates/base/root.html:51 msgid "loading ..." msgstr "загрузка..." -#: kallithea/templates/base/root.html:54 +#: kallithea/templates/base/root.html:52 msgid "Search truncated" msgstr "Поиск усечен" -#: kallithea/templates/base/root.html:55 +#: kallithea/templates/base/root.html:53 msgid "No matching files" msgstr "Нет совпадений" -#: kallithea/templates/base/root.html:56 +#: 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 "Создать новый pull запрос" -#: kallithea/templates/base/root.html:57 +#: kallithea/templates/base/root.html:55 msgid "Open new pull request for selected changesets" msgstr "Открыть новый pull-request для выделенных наборов изменений" -#: kallithea/templates/base/root.html:58 +#: kallithea/templates/base/root.html:56 msgid "Show selected changesets __S -> __E" msgstr "Показать выбранные наборы изменений: __S -> __E" +#: kallithea/templates/base/root.html:57 +msgid "Show selected changeset __S" +msgstr "Показать выбранный набор изменений: __S" + +#: kallithea/templates/base/root.html:58 +msgid "Selection link" +msgstr "Ссылка выбора" + #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" -msgstr "Показать выбранный набор изменений: __S" - -#: kallithea/templates/base/root.html:60 -msgid "Selection link" -msgstr "Ссылка выбора" - -#: kallithea/templates/base/root.html:61 #: kallithea/templates/changeset/diff_block.html:8 msgid "Collapse diff" msgstr "Свернуть сравнение" -#: kallithea/templates/base/root.html:62 +#: kallithea/templates/base/root.html:60 msgid "Expand diff" msgstr "Раскрыть сравнение" -#: kallithea/templates/base/root.html:63 +#: kallithea/templates/base/root.html:61 msgid "Failed to revoke permission" msgstr "Не удалось отозвать привилегии" -#: kallithea/templates/base/root.html:64 +#: kallithea/templates/base/root.html:62 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "подтвердите удаление привилегии для {0}: {1}" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr "" @@ -4640,7 +4625,9 @@ msgid "" "Changeset status: %s\n" "Click to open associated pull request #%s" -msgstr "Статус набора изенений: %s⏎\nКликрните, чтобы перейти к соответствующему pull-request'у #%s" +msgstr "" +"Статус набора изенений: %s⏎\n" +"Кликрните, чтобы перейти к соответствующему pull-request'у #%s" #: kallithea/templates/changelog/changelog.html:86 #: kallithea/templates/compare/compare_cs.html:18 @@ -4870,13 +4857,16 @@ #: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "Comments parsed using %s syntax with %s support." -msgstr "Парсинг комментариев выполнен с использованием синтаксиса %s с поддержкой %s." +msgstr "" +"Парсинг комментариев выполнен с использованием синтаксиса %s с поддержкой" +" %s." #: kallithea/templates/changeset/changeset_file_comment.html:69 #: kallithea/templates/changeset/changeset_file_comment.html:155 -msgid "" -"Use @username inside this text to send notification to this Kallithea user" -msgstr "Используйте @имя_пользователя в тексте, чтобы отправить оповещение указанному пользователю Kallithea" +msgid "Use @username inside this text to send notification to this Kallithea user" +msgstr "" +"Используйте @имя_пользователя в тексте, чтобы отправить оповещение " +"указанному пользователю Kallithea" #: kallithea/templates/changeset/changeset_file_comment.html:73 #: kallithea/templates/changeset/changeset_file_comment.html:166 @@ -5059,13 +5049,18 @@ #: kallithea/templates/email_templates/password_reset.html:10 msgid "Please ignore this email if you did not request a new password ." -msgstr "Пожалуйста, проигнорируйте данное сообщение, если вы не запрашивали новый пароль." +msgstr "" +"Пожалуйста, проигнорируйте данное сообщение, если вы не запрашивали новый" +" пароль." #: kallithea/templates/email_templates/pull_request.html:6 #, python-format msgid "" -"%s opened a pull request for repository %s and wants you to review changes." -msgstr "%s открыл pull-request для репозитория %s и просит вас просмотреть изменения" +"%s opened a pull request for repository %s and wants you to review " +"changes." +msgstr "" +"%s открыл pull-request для репозитория %s и просит вас просмотреть " +"изменения" #: kallithea/templates/email_templates/pull_request.html:8 #: kallithea/templates/pullrequests/pullrequest.html:31 @@ -5736,3 +5731,4 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "Сравнить метки" +
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -1,4 +1,4 @@ -# Translations template for Kallithea. +# Chinese (China) translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. # Translators: @@ -7,104 +7,103 @@ # xpol <xpolife@gmail.com>, 2012 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/Kallithea/language/zh_CN/)\n" +"Language-Team: Chinese (China) " +"(http://www.transifex.com/projects/p/Kallithea/language/zh_CN/)\n" +"Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 + +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "还没有修订集" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "所有分支" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "状态修改为%s" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" - -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +"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 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "主页" -#: kallithea/controllers/error.py:99 -msgid "" -"The request could not be understood by the server due to malformed syntax." +#: kallithea/controllers/error.py:101 +msgid "The request could not be understood by the server due to malformed syntax." msgstr "由于错误的语法，服务器无法对请求进行响应。" -#: kallithea/controllers/error.py:102 +#: kallithea/controllers/error.py:104 msgid "Unauthorized access to resource" msgstr "未授权的资源访问" -#: kallithea/controllers/error.py:104 +#: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" msgstr "无权访问该页面" -#: kallithea/controllers/error.py:106 +#: kallithea/controllers/error.py:108 msgid "The resource could not be found" msgstr "资源未找到" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。" -#: kallithea/controllers/feed.py:53 +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "%s库的修改" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "%s %s订阅" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -114,405 +113,403 @@ msgid "Changeset was too big and was cut off..." msgstr "修订集太大已被截断......" -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "版本库由%s于%s锁定" -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "无变更" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "无内容" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "无文件名" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:522 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "空版本库" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "未知包类型" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "修订集" -#: kallithea/controllers/files.py:774 -#: kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:775 -#: kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "标签" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" -#: kallithea/controllers/home.py:81 +#: kallithea/controllers/home.py:86 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:86 +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "版本库" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "公共日志" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "日志" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "密码重置链接已经发送" -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "" -"Your password reset was successful, new password has been sent to your email" +"Your password reset was successful, new password has been sent to your " +"email" msgstr "密码已经成功重置，新密码已经发送到你的邮箱" -#: kallithea/controllers/pullrequests.py:138 +#: 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:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "书签" -#: kallithea/controllers/pullrequests.py:328 +#: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" msgstr "拉取请求的标题至少3个字符" -#: kallithea/controllers/pullrequests.py:330 +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "提交拉取请求时发生错误" -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "" -#: kallithea/controllers/pullrequests.py:520 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" +#: kallithea/controllers/pullrequests.py:522 +msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "只能以批准或者驳回的状态关闭拉取请求" -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "没有索引用于搜索。请运行whoosh索引器" -#: kallithea/controllers/search.py:142 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "在搜索操作中发生异常" -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "数据未加载" -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "默认设置已经成功更新" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" +msgid "forever" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: 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 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: kallithea/controllers/admin/my_account.py:125 +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "已为用户添加电子邮件 %s" -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "成功删除用户电子邮件" -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "无" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "读" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" -msgstr "写" +#: 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 +msgid "Read" +msgstr "读" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "写" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -531,467 +528,438 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 msgid "Disabled" msgstr "停用" -#: kallithea/controllers/admin/permissions.py:76 -msgid "Allowed with manual account activation" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "启用" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "这个组内有%s个版本库因而无法删除" -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "版本库%s成功更新" -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除%s的时候发生错误" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "令牌不匹配" -#: kallithea/controllers/admin/repos.py:544 +#: kallithea/controllers/admin/repos.py:546 msgid "Nothing" msgstr "无" -#: kallithea/controllers/admin/repos.py:546 +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "解锁时发生错误" -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:596 -msgid "Locked" -msgstr "" - #: kallithea/controllers/admin/repos.py:598 +msgid "Locked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "版本库已被%s" -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: kallithea/controllers/admin/repos.py:671 +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: kallithea/controllers/admin/settings.py:269 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "更新应用设置" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "新建钩子" -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "更新钩子" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "" -"Your license will expire on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "" -"Your license has expired on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:571 -msgid "" -"Unexpected error while reading license key. Please make sure your license " -"token and key are correct" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "用户更新成功" -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "删除用户时发生错误" -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "无法编辑该用户" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "必须登录才能访问该页面" -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:80 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" +#: kallithea/lib/diffs.py:82 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "修订集因过大而被截断，可查看原始修订集作为替代" -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "未发现差异" @@ -1027,8 +995,7 @@ msgid "%s more" msgstr "%s个" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "修订" @@ -1123,132 +1090,103 @@ msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr "还有%s个" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "没有文件" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, 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" +"%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 "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启Kallithea以重新扫描版本库" -#: kallithea/lib/utils2.py:413 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "%s" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%s ago" msgstr "%s前" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:440 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "%s零%s前" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" 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: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:1659 -msgid "Repository no 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: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:1660 -msgid "Repository read 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:1305 @@ -1261,8 +1199,8 @@ #: 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 write access" -msgstr "版本库写入权限" +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 @@ -1276,159 +1214,159 @@ #: 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 admin access" -msgstr "版本库管理权限" +msgid "Repository read access" +msgstr "版本库读取权限" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" +msgstr "版本库写入权限" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no 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:1309 -msgid "Repositories Group read access" -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:1664 +msgid "Repository admin 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 "Repositories Group write access" -msgstr "版本库组写入" +msgid "Repositories 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 "Repositories Group admin access" -msgstr "版本库组管理权限" +msgid "Repositories Group read 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 "Repositories Group write access" +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 -#: 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:1657 -msgid "Kallithea Administrator" -msgstr "Kallithea 管理员" - -#: 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: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:1680 -msgid "Repository creation disabled" -msgstr "禁用创建版本库" +msgid "Repositories Group admin access" +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: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:1681 -msgid "Repository creation enabled" -msgstr "允许创建版本库" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 kallithea/model/db.py:1659 +msgid "Kallithea Administrator" +msgstr "Kallithea 管理员" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1431 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1477 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1556 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1595 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 +msgid "Repository creation disabled" +msgstr "禁用创建版本库" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking 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: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:1686 -msgid "Repository forking enabled" -msgstr "允许复刻版本库" +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" +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 -msgid "Register disabled" -msgstr "禁用注册" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" +msgstr "禁用复刻版本库" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "允许复刻版本库" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "禁用注册" + +#: 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:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" 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: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:2210 -msgid "Not Reviewed" -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: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:2211 -msgid "Approved" -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:1765 @@ -1441,8 +1379,8 @@ #: 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 "Rejected" -msgstr "驳回" +msgid "Not Reviewed" +msgstr "未检视" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1654 @@ -1456,45 +1394,51 @@ #: 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 msgid "Under Review" msgstr "检视中" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 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:1664 -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:1665 -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 @@ -1504,7 +1448,7 @@ #: 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 write access" +msgid "Repository group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1516,9 +1460,22 @@ #: 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 admin access" -msgstr "" - +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_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 @@ -1527,18 +1484,7 @@ #: 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 "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:1670 -msgid "User group read access" +msgid "Repository group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1549,7 +1495,7 @@ #: 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 write access" +msgid "User group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1560,7 +1506,18 @@ #: 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 admin access" +msgid "User group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1571,20 +1528,20 @@ #: 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 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:1675 -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 @@ -1593,42 +1550,31 @@ #: 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 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 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:1688 -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:1689 -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 @@ -1637,27 +1583,47 @@ #: 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 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:75 +#: 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 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "在%s行" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "[提及]" @@ -1683,73 +1649,73 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:230 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:231 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - #: kallithea/model/notification.py:232 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:233 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:234 #, python-format +msgid "%(user)s registered in Kallithea at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:235 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:236 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "最新tip版本" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: kallithea/model/user.py:268 +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" msgstr "由于是系统帐号，无法删除该用户" -#: kallithea/model/user.py:274 +#: 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" +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: kallithea/model/user.py:302 +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "" @@ -1770,8 +1736,8 @@ #: kallithea/model/validators.py:124 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" msgstr "" #: kallithea/model/validators.py:151 @@ -1899,8 +1865,8 @@ #: kallithea/model/validators.py:791 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名" #: kallithea/model/validators.py:804 @@ -1914,8 +1880,7 @@ #: kallithea/model/validators.py:837 #, python-format -msgid "" -"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" #: kallithea/model/validators.py:870 @@ -1931,6 +1896,10 @@ 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "控制面板" @@ -2052,7 +2021,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2064,7 +2033,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2080,7 +2049,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2092,8 +2061,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 -#: kallithea/templates/base/root.html:73 +#: 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 @@ -2103,7 +2071,7 @@ msgstr "载入中..." #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "登录" @@ -2118,14 +2086,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 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:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "密码" @@ -2141,7 +2109,7 @@ msgid "Forgot your password ?" msgstr "忘记了密码？" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "还没有帐号？" @@ -2240,7 +2208,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "系统日志" @@ -2301,7 +2269,7 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "" @@ -2324,12 +2292,12 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "" @@ -2363,7 +2331,7 @@ msgstr "版本库默认设置" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "默认设置" @@ -2538,7 +2506,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2613,7 +2580,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "我的账户" @@ -2791,8 +2758,8 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:26 msgid "" -"Your user is in an external Source of Record; some details cannot be managed" -" here" +"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 @@ -2842,7 +2809,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2869,7 +2836,7 @@ msgstr "评论" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "" @@ -2887,7 +2854,7 @@ msgstr "显示通知" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "通知" @@ -2900,7 +2867,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "权限" @@ -2931,8 +2898,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2978,8 +2945,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to repository groups allows creating repositories inside" +" that group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3027,7 +2994,7 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "" @@ -3073,8 +3040,7 @@ #: 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:77 -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "设置" @@ -3199,8 +3165,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 @@ -3248,8 +3214,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 #: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" #: kallithea/templates/admin/repos/repo_add_base.html:45 @@ -3285,8 +3250,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:30 #, python-format msgid "" -"Repository \"%(repo_name)s\" is beeing created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:42 @@ -3348,8 +3313,8 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:43 msgid "" -"All actions made on this repository will be accessible to everyone in public" -" journal" +"All actions made on this repository will be accessible to everyone in " +"public journal" msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" #: kallithea/templates/admin/repos/repo_edit_advanced.html:49 @@ -3378,9 +3343,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:73 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Trigering a pull locks repository by user who pulled, only the same user can" -" unlock by doing a push" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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 @@ -3409,9 +3374,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" +"This repository will be renamed in a special way in order to be " +"unaccesible for Kallithea and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 @@ -3424,8 +3389,8 @@ #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 @@ -3518,9 +3483,12 @@ #: 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 allways be accessible under such url.\n" -" Usefull 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 above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull 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 @@ -3614,10 +3582,6 @@ msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "" @@ -3700,12 +3664,11 @@ #: kallithea/templates/admin/settings/settings_global.html:50 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" +"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_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3717,8 +3680,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3729,57 +3692,6 @@ msgid "Failed to remove hook" msgstr "移除钩子失败" -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "" -"Please enter following lines (if yet not present) into [app:main] section of" -" your .ini file. The token below is autogenerated." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "" @@ -3790,8 +3702,9 @@ #: 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." +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3800,8 +3713,8 @@ #: 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." +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 @@ -3810,8 +3723,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallitheas GIT hooks are installed for each repository. Current" +" hooks will be updated to latest version" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3837,6 +3750,10 @@ msgstr "重新索引" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "" @@ -3926,14 +3843,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this" -" value a restart and rescan of the repository folder are required." +"Filesystem location where repositories should be stored. After changing " +"this value a restart and rescan of the repository folder are required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3963,22 +3880,34 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar url allows you to use other avatar server application.\n" -" Following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:54 @@ -3987,8 +3916,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:58 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:64 @@ -4036,7 +3965,7 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "" @@ -4120,7 +4049,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "用户" @@ -4190,8 +4119,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4231,50 +4160,50 @@ msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "概况" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "修订记录" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "浏览" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "选项" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "比较复刻" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4284,112 +4213,112 @@ msgid "Compare" msgstr "比较显示" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:182 -msgid "Unfollow" -msgstr "" - #: kallithea/templates/base/base.html:185 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "复刻" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "登录" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "忘记密码？" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "退出" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "日志" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "公共日志" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:321 -msgid "Gists" -msgstr "" - #: kallithea/templates/base/base.html:324 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:325 -msgid "All public gists" +msgid "Gists" msgstr "" #: kallithea/templates/base/base.html:327 -msgid "My public gists" +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:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "" @@ -4400,8 +4329,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4450,84 +4379,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:45 msgid "Add another comment" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "停止关注该版本库" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:47 msgid "Start following this repository" msgstr "开始关注该版本库" -#: kallithea/templates/base/root.html:50 +#: kallithea/templates/base/root.html:48 msgid "Group" msgstr "组" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:49 msgid "members" msgstr "成员" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:50 #: kallithea/templates/pullrequests/pullrequest.html:202 msgid "Loading ..." msgstr "" +#: kallithea/templates/base/root.html:51 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:52 +msgid "Search truncated" +msgstr "" + #: kallithea/templates/base/root.html:53 -msgid "loading ..." +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:54 -msgid "Search truncated" -msgstr "" - -#: kallithea/templates/base/root.html:55 -msgid "No matching files" -msgstr "" - -#: kallithea/templates/base/root.html:56 #: 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:57 +#: 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 "Show selected changesets __S -> __E" -msgstr "" +msgid "Selection link" +msgstr "选择链接" #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse diff" msgstr "" #: kallithea/templates/base/root.html:60 -msgid "Selection link" -msgstr "选择链接" +msgid "Expand diff" +msgstr "" #: kallithea/templates/base/root.html:61 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:62 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:63 -msgid "Failed to revoke permission" -msgstr "" - -#: kallithea/templates/base/root.html:64 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr "" @@ -4831,8 +4760,7 @@ #: 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" +msgid "Use @username inside this text to send notification to this Kallithea user" msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" #: kallithea/templates/changeset/changeset_file_comment.html:73 @@ -5019,7 +4947,8 @@ #: 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." +"%s opened a pull request for repository %s and wants you to review " +"changes." msgstr "" #: kallithea/templates/email_templates/pull_request.html:8 @@ -5687,3 +5616,4 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "比较标签" +
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Wed Jul 02 19:06:11 2014 -0400 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Wed Jul 02 19:08:27 2014 -0400 @@ -1,108 +1,107 @@ -# Translations template for Kallithea. +# Chinese (Taiwan) translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. # Translators: # FIRST AUTHOR <EMAIL@ADDRESS>, 2011 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2014-02-13 15:30+0100\n" +"POT-Creation-Date: 2014-07-02 19:08-0400\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/Kallithea/language/zh_TW/)\n" +"Language-Team: Chinese (Taiwan) " +"(http://www.transifex.com/projects/p/Kallithea/language/zh_TW/)\n" +"Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"Language: zh_TW\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: kallithea/controllers/changelog.py:88 kallithea/controllers/compare.py:88 -#: kallithea/controllers/pullrequests.py:263 + +#: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 +#: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:184 +#: kallithea/controllers/changelog.py:186 msgid "All Branches" msgstr "" -#: kallithea/controllers/changelog.py:187 +#: kallithea/controllers/changelog.py:189 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:87 msgid "Show white space" msgstr "" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101 msgid "Ignore white space" msgstr "" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:207 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:119 +#: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:353 -#: kallithea/controllers/pullrequests.py:480 +#: kallithea/controllers/changeset.py:355 +#: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" msgstr "" -#: kallithea/controllers/changeset.py:384 +#: kallithea/controllers/changeset.py:386 msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" - -#: kallithea/controllers/compare.py:192 kallithea/templates/base/root.html:67 +"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 msgid "Select changeset" msgstr "" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:72 msgid "Home page" msgstr "首頁" -#: kallithea/controllers/error.py:99 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:102 -msgid "Unauthorized access to resource" +#: 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 "You don't have permission to view this page" -msgstr "您沒有權限瀏覽這個頁面" +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 msgid "The resource could not be found" msgstr "找不到這個資源" -#: kallithea/controllers/error.py:108 +#: kallithea/controllers/error.py:110 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:53 +#: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" msgstr "修改於版本庫 %s" -#: kallithea/controllers/feed.py:54 +#: kallithea/controllers/feed.py:56 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:87 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:139 #: kallithea/templates/changeset/changeset.html:151 #: kallithea/templates/compare/compare_diff.html:75 @@ -112,405 +111,403 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" msgstr "" -#: kallithea/controllers/files.py:90 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 +#: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 +#: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 +#: kallithea/controllers/files.py:498 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:403 msgid "No changes" msgstr "沒有修改" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:412 kallithea/controllers/files.py:487 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:461 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:465 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:522 +#: kallithea/controllers/files.py:524 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:537 msgid "Empty repository" msgstr "空的版本庫" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:539 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: kallithea/controllers/files.py:773 +#: 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 msgid "Changesets" msgstr "變更" -#: kallithea/controllers/files.py:774 -#: kallithea/controllers/pullrequests.py:158 -#: kallithea/controllers/summary.py:74 kallithea/model/scm.py:816 +#: kallithea/controllers/files.py:776 kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/summary.py:76 kallithea/model/scm.py:818 #: kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:13 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:775 -#: kallithea/controllers/pullrequests.py:159 -#: kallithea/controllers/summary.py:75 kallithea/model/scm.py:827 +#: kallithea/controllers/files.py:777 kallithea/controllers/pullrequests.py:161 +#: kallithea/controllers/summary.py:77 kallithea/model/scm.py:829 #: kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:13 msgid "Tags" msgstr "標籤" -#: kallithea/controllers/forks.py:189 +#: kallithea/controllers/forks.py:191 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:81 -msgid "Groups" -msgstr "" - #: kallithea/controllers/home.py:86 +msgid "Groups" +msgstr "" + +#: kallithea/controllers/home.py:91 #: 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/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:70 kallithea/templates/base/base.html:87 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/base/base.html:389 -#: kallithea/templates/base/base.html:560 +#: 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 msgid "Repositories" msgstr "版本庫" -#: kallithea/controllers/home.py:127 kallithea/templates/files/files.html:33 +#: 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 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:138 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:144 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" msgstr "" -#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:159 +#: kallithea/controllers/journal.py:118 kallithea/controllers/journal.py:161 #: kallithea/templates/journal/journal.html:15 msgid "journal" msgstr "日誌" -#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230 +#: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" msgstr "" -#: kallithea/controllers/login.py:191 +#: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" msgstr "" -#: kallithea/controllers/login.py:235 +#: kallithea/controllers/login.py:237 msgid "Your password reset link was sent" msgstr "您的密碼重設連結已寄出" -#: kallithea/controllers/login.py:255 +#: kallithea/controllers/login.py:257 msgid "" -"Your password reset was successful, new password has been sent to your email" +"Your password reset was successful, new password has been sent to your " +"email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: kallithea/controllers/pullrequests.py:138 +#: 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:155 +#: kallithea/controllers/pullrequests.py:157 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:156 +#: kallithea/controllers/pullrequests.py:158 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:157 kallithea/model/scm.py:822 +#: kallithea/controllers/pullrequests.py:159 kallithea/model/scm.py:824 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:13 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:328 -msgid "Pull request requires a title with min. 3 chars" -msgstr "" - #: kallithea/controllers/pullrequests.py:330 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + +#: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:395 +#: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:483 +#: kallithea/controllers/pullrequests.py:485 msgid "Closing with" msgstr "" -#: kallithea/controllers/pullrequests.py:520 -msgid "" -"Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" - -#: kallithea/controllers/search.py:133 +#: kallithea/controllers/pullrequests.py:522 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" -#: kallithea/controllers/search.py:138 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" -#: kallithea/controllers/search.py:142 +#: kallithea/controllers/search.py:144 msgid "An error occurred during this search operation" msgstr "" -#: kallithea/controllers/summary.py:201 +#: kallithea/controllers/summary.py:203 msgid "No data loaded yet" msgstr "" -#: kallithea/controllers/summary.py:204 +#: kallithea/controllers/summary.py:206 #: kallithea/templates/summary/summary.html:105 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" -#: kallithea/controllers/admin/auth_settings.py:125 +#: kallithea/controllers/admin/auth_settings.py:127 msgid "Auth settings updated successfully" msgstr "" -#: kallithea/controllers/admin/auth_settings.py:136 +#: kallithea/controllers/admin/auth_settings.py:138 msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:95 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:109 +#: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" msgstr "" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:255 -#: kallithea/controllers/admin/users.py:287 -msgid "forever" -msgstr "" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:256 -#: kallithea/controllers/admin/users.py:288 -msgid "5 minutes" -msgstr "" - #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:289 -msgid "1 hour" +msgid "forever" msgstr "" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 -msgid "1 day" +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 -msgid "1 month" -msgstr "" - -#: kallithea/controllers/admin/gists.py:66 +msgid "1 hour" +msgstr "" + +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:260 +#: 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 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:234 msgid "unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:263 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:268 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:271 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:68 +#: kallithea/controllers/admin/my_account.py:70 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:125 +#: kallithea/controllers/admin/my_account.py:127 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: kallithea/controllers/admin/my_account.py:139 -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/my_account.py:141 +#: kallithea/controllers/admin/users.py:207 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:159 +#: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/admin/my_account.py:169 +#: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:211 -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:217 -#: kallithea/controllers/admin/users.py:436 +#: kallithea/controllers/admin/my_account.py:219 +#: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:447 +#: kallithea/controllers/admin/my_account.py:228 +#: kallithea/controllers/admin/users.py:449 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:272 -#: kallithea/controllers/admin/users.py:313 +#: kallithea/controllers/admin/my_account.py:274 +#: kallithea/controllers/admin/users.py:315 msgid "Api key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:284 -#: kallithea/controllers/admin/users.py:329 +#: kallithea/controllers/admin/my_account.py:286 +#: kallithea/controllers/admin/users.py:331 msgid "Api key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:288 -#: kallithea/controllers/admin/users.py:333 +#: kallithea/controllers/admin/my_account.py:290 +#: kallithea/controllers/admin/users.py:335 msgid "Api key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:60 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -msgid "None" -msgstr "無" - -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -msgid "Read" -msgstr "讀" - #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:70 -msgid "Write" -msgstr "寫" +#: 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 +msgid "Read" +msgstr "讀" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +msgid "Write" +msgstr "寫" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:12 #: kallithea/templates/admin/defaults/defaults.html:12 #: kallithea/templates/admin/permissions/permissions.html:12 @@ -529,467 +526,438 @@ #: 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:339 -#: kallithea/templates/base/base.html:340 -#: kallithea/templates/base/base.html:346 -#: kallithea/templates/base/base.html:347 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:349 +#: kallithea/templates/base/base.html:350 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:74 -#: kallithea/controllers/admin/permissions.py:85 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:93 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 msgid "Disabled" msgstr "停用" -#: kallithea/controllers/admin/permissions.py:76 -msgid "Allowed with manual account activation" -msgstr "" - #: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:81 -#: 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/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 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:82 -#: 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:1693 +#: 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 msgid "Automatic activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:89 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 msgid "Enabled" msgstr "啟用" -#: kallithea/controllers/admin/permissions.py:123 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:137 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:184 +#: kallithea/controllers/admin/repo_groups.py:186 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:196 +#: kallithea/controllers/admin/repo_groups.py:198 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:254 +#: kallithea/controllers/admin/repo_groups.py:256 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:269 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:287 +#: kallithea/controllers/admin/repo_groups.py:289 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:294 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:300 +#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:307 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:417 -#: kallithea/controllers/admin/repo_groups.py:452 -#: kallithea/controllers/admin/user_groups.py:335 +#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:454 +#: kallithea/controllers/admin/user_groups.py:337 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:432 +#: kallithea/controllers/admin/repo_groups.py:434 msgid "Repository Group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:469 -#: kallithea/controllers/admin/repos.py:424 -#: kallithea/controllers/admin/user_groups.py:347 +#: kallithea/controllers/admin/repo_groups.py:471 +#: kallithea/controllers/admin/repos.py:426 +#: kallithea/controllers/admin/user_groups.py:349 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:160 +#: kallithea/controllers/admin/repos.py:162 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:235 +#: kallithea/controllers/admin/repos.py:237 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:244 +#: kallithea/controllers/admin/repos.py:246 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:247 +#: kallithea/controllers/admin/repos.py:249 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:287 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: kallithea/controllers/admin/repos.py:305 +#: kallithea/controllers/admin/repos.py:307 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:332 +#: kallithea/controllers/admin/repos.py:334 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:335 +#: kallithea/controllers/admin/repos.py:337 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:340 +#: kallithea/controllers/admin/repos.py:342 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:343 +#: kallithea/controllers/admin/repos.py:345 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: kallithea/controllers/admin/repos.py:348 +#: kallithea/controllers/admin/repos.py:350 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:400 +#: kallithea/controllers/admin/repos.py:402 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:456 +#: kallithea/controllers/admin/repos.py:458 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:470 +#: kallithea/controllers/admin/repos.py:472 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:486 +#: kallithea/controllers/admin/repos.py:488 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:522 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:524 +#: kallithea/controllers/admin/repos.py:526 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:529 kallithea/model/validators.py:359 +#: kallithea/controllers/admin/repos.py:531 kallithea/model/validators.py:359 msgid "Token mismatch" msgstr "" -#: kallithea/controllers/admin/repos.py:544 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:546 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:569 +#: kallithea/controllers/admin/repos.py:571 msgid "Locked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:572 +#: kallithea/controllers/admin/repos.py:574 msgid "Unlocked repository" msgstr "" -#: kallithea/controllers/admin/repos.py:575 -#: kallithea/controllers/admin/repos.py:602 +#: kallithea/controllers/admin/repos.py:577 +#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:593 +#: kallithea/controllers/admin/repos.py:595 msgid "Unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:596 -msgid "Locked" -msgstr "" - #: kallithea/controllers/admin/repos.py:598 +msgid "Locked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:600 #, python-format msgid "Repository has been %s" msgstr "" -#: kallithea/controllers/admin/repos.py:616 +#: kallithea/controllers/admin/repos.py:618 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:620 +#: kallithea/controllers/admin/repos.py:622 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:635 +#: kallithea/controllers/admin/repos.py:637 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:638 +#: kallithea/controllers/admin/repos.py:640 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:671 +#: kallithea/controllers/admin/repos.py:673 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:171 +#: kallithea/controllers/admin/settings.py:172 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:175 +#: kallithea/controllers/admin/settings.py:176 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:181 -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:182 +#: kallithea/controllers/admin/settings.py:274 msgid "Error occurred during updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:214 +#: kallithea/controllers/admin/settings.py:215 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: kallithea/controllers/admin/settings.py:269 +#: kallithea/controllers/admin/settings.py:270 msgid "Updated application settings" msgstr "更新應用設定" -#: kallithea/controllers/admin/settings.py:326 +#: kallithea/controllers/admin/settings.py:327 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:331 +#: kallithea/controllers/admin/settings.py:332 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:358 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:369 +#: kallithea/controllers/admin/settings.py:370 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:399 +#: kallithea/controllers/admin/settings.py:400 msgid "Added new hook" msgstr "新增hook" -#: kallithea/controllers/admin/settings.py:413 +#: kallithea/controllers/admin/settings.py:414 msgid "Updated hooks" msgstr "更新hook" -#: kallithea/controllers/admin/settings.py:417 +#: kallithea/controllers/admin/settings.py:418 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:443 +#: kallithea/controllers/admin/settings.py:444 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: kallithea/controllers/admin/settings.py:535 -msgid "Updated license information" -msgstr "" - -#: kallithea/controllers/admin/settings.py:540 -msgid "Error occurred during updating license info" -msgstr "" - -#: kallithea/controllers/admin/settings.py:563 -#, python-format -msgid "" -"Your license will expire on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:566 -#, python-format -msgid "" -"Your license has expired on %s, please contact support to extend your " -"license." -msgstr "" - -#: kallithea/controllers/admin/settings.py:571 -msgid "" -"Unexpected error while reading license key. Please make sure your license " -"token and key are correct" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:148 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:159 +#: kallithea/controllers/admin/user_groups.py:161 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:197 +#: kallithea/controllers/admin/user_groups.py:199 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:221 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:237 +#: kallithea/controllers/admin/user_groups.py:239 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:244 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:309 +#: kallithea/controllers/admin/user_groups.py:311 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:315 +#: kallithea/controllers/admin/user_groups.py:317 msgid "User Group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:435 -#: kallithea/controllers/admin/users.py:395 +#: kallithea/controllers/admin/user_groups.py:437 +#: kallithea/controllers/admin/users.py:397 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:439 -#: kallithea/controllers/admin/users.py:399 +#: kallithea/controllers/admin/user_groups.py:441 +#: kallithea/controllers/admin/users.py:401 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:135 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:147 +#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:186 +#: kallithea/controllers/admin/users.py:188 msgid "User updated successfully" msgstr "使用者更新完成" -#: kallithea/controllers/admin/users.py:221 +#: kallithea/controllers/admin/users.py:223 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:226 +#: kallithea/controllers/admin/users.py:228 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:240 -#: kallithea/controllers/admin/users.py:258 -#: kallithea/controllers/admin/users.py:281 -#: kallithea/controllers/admin/users.py:306 -#: kallithea/controllers/admin/users.py:319 -#: kallithea/controllers/admin/users.py:343 -#: kallithea/controllers/admin/users.py:406 -#: kallithea/controllers/admin/users.py:453 +#: 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 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: kallithea/controllers/admin/users.py:481 +#: kallithea/controllers/admin/users.py:483 #, python-format msgid "Added ip %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:487 +#: kallithea/controllers/admin/users.py:489 msgid "An error occurred during ip saving" msgstr "" -#: kallithea/controllers/admin/users.py:501 +#: kallithea/controllers/admin/users.py:503 msgid "Removed ip address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:746 +#: kallithea/lib/auth.py:748 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:807 +#: kallithea/lib/auth.py:809 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:846 msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: kallithea/lib/diffs.py:64 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:80 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:90 +#: kallithea/lib/diffs.py:82 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "尚未有任何變更" @@ -1025,8 +993,7 @@ msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:692 -#: kallithea/templates/changelog/changelog.html:58 +#: kallithea/lib/helpers.py:692 kallithea/templates/changelog/changelog.html:58 msgid "revisions" msgstr "修訂" @@ -1121,132 +1088,103 @@ msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1102 +#: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1106 +#: kallithea/lib/helpers.py:1105 msgid "No Files" msgstr "沒有檔案" -#: kallithea/lib/helpers.py:1172 +#: kallithea/lib/helpers.py:1171 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1175 +#: kallithea/lib/helpers.py:1174 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1178 +#: kallithea/lib/helpers.py:1177 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1181 +#: kallithea/lib/helpers.py:1180 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1186 +#: kallithea/lib/helpers.py:1185 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1418 +#: kallithea/lib/helpers.py:1417 #, 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:413 +"%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 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: kallithea/lib/utils2.py:414 +#: kallithea/lib/utils2.py:416 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:417 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:418 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:419 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:420 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:436 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:436 -#, python-format -msgid "%s ago" -msgstr "" - #: kallithea/lib/utils2.py:438 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/utils2.py:440 +#, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:441 +#: kallithea/lib/utils2.py:443 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:444 +#: kallithea/lib/utils2.py:446 msgid "just now" 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: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:1659 -msgid "Repository no 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: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:1660 -msgid "Repository read 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:1305 @@ -1259,7 +1197,7 @@ #: 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 write access" +msgid "Repository no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1167 @@ -1274,159 +1212,159 @@ #: 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 admin access" +msgid "Repository read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1307 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1392 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1412 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1458 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1576 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1653 kallithea/model/db.py:1663 +msgid "Repository write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repositories Group no 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:1309 -msgid "Repositories Group read access" +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664 +msgid "Repository admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_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 "Repositories Group write access" +msgid "Repositories 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 "Repositories Group admin access" +msgid "Repositories Group read 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 "Repositories Group write access" 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 -#: 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:1657 -msgid "Kallithea Administrator" -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: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:1680 -msgid "Repository creation disabled" +msgid "Repositories Group admin access" 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: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:1681 -msgid "Repository creation enabled" +#: 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:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 -msgid "Repository forking disabled" +#: 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: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:1686 -msgid "Repository forking enabled" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 +msgid "Repository creation enabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_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 -msgid "Register disabled" +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1434 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1480 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1559 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1598 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1677 kallithea/model/db.py:1687 +msgid "Repository forking disabled" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1688 +msgid "Repository forking enabled" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1181 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1200 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1320 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1405 +msgid "Register disabled" +msgstr "" + +#: 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:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +#: 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 msgid "Register new user with Kallithea with auto activation" 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: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:2210 -msgid "Not Reviewed" -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: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:2211 -msgid "Approved" -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:1765 @@ -1439,7 +1377,7 @@ #: 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 "Rejected" +msgid "Not Reviewed" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1627 @@ -1454,45 +1392,51 @@ #: 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 msgid "Under Review" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1508 +#: 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 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:1664 -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:1665 -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 @@ -1502,7 +1446,7 @@ #: 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 write access" +msgid "Repository group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 @@ -1514,9 +1458,22 @@ #: 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 admin access" -msgstr "" - +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_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 @@ -1525,18 +1482,7 @@ #: 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 "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:1670 -msgid "User group read access" +msgid "Repository group admin access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 @@ -1547,7 +1493,7 @@ #: 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 write access" +msgid "User group no access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 @@ -1558,7 +1504,18 @@ #: 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 admin access" +msgid "User group read access" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1422 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1468 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1547 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1586 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1636 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1663 kallithea/model/db.py:1673 +msgid "User group write access" msgstr "" #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 @@ -1569,20 +1526,20 @@ #: 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 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:1675 -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 @@ -1591,42 +1548,31 @@ #: 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 msgid "User Group creation disabled" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 kallithea/model/db.py:1678 +#: 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 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:1688 -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:1689 -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 @@ -1635,27 +1581,47 @@ #: 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 msgid "User Registration with automatic account activation" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1682 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1683 -msgid "" -"Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:75 +#: 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 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 kallithea/model/db.py:1685 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/comment.py:77 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:220 +#: kallithea/model/comment.py:222 msgid "[Mention]" msgstr "" @@ -1681,73 +1647,73 @@ msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:229 +#: kallithea/model/notification.py:231 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:230 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:231 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - #: kallithea/model/notification.py:232 #, python-format -msgid "%(user)s registered in Kallithea at %(when)s" +msgid "%(user)s sent message at %(when)s" msgstr "" #: kallithea/model/notification.py:233 #, python-format -msgid "%(user)s opened new pull request at %(when)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:234 #, python-format +msgid "%(user)s registered in Kallithea at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:235 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:236 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/pull_request.py:105 +#: kallithea/model/pull_request.py:107 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:808 +#: kallithea/model/scm.py:810 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:196 +#: kallithea/model/user.py:198 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:220 kallithea/model/user.py:245 +#: kallithea/model/user.py:222 kallithea/model/user.py:247 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: kallithea/model/user.py:268 +#: kallithea/model/user.py:270 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: kallithea/model/user.py:274 +#: 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:302 +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" + +#: kallithea/model/user.py:304 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:331 +#: kallithea/model/user.py:333 msgid "Your new password" msgstr "" -#: kallithea/model/user.py:332 +#: kallithea/model/user.py:334 #, python-format msgid "Your new Kallithea password:%s" msgstr "" @@ -1768,8 +1734,8 @@ #: kallithea/model/validators.py:124 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character or underscore" msgstr "" #: kallithea/model/validators.py:151 @@ -1897,8 +1863,8 @@ #: kallithea/model/validators.py:791 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" +"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 @@ -1912,8 +1878,7 @@ #: kallithea/model/validators.py:837 #, python-format -msgid "" -"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" #: kallithea/model/validators.py:870 @@ -1929,6 +1894,10 @@ 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 +msgid "About" +msgstr "" + #: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "儀表板" @@ -2050,7 +2019,7 @@ #: 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:69 +#: kallithea/templates/base/root.html:67 #: kallithea/templates/bookmarks/bookmarks.html:81 #: kallithea/templates/branches/branches.html:80 #: kallithea/templates/journal/journal.html:208 @@ -2062,7 +2031,7 @@ #: 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:70 +#: kallithea/templates/base/root.html:68 #: kallithea/templates/bookmarks/bookmarks.html:82 #: kallithea/templates/branches/branches.html:81 #: kallithea/templates/journal/journal.html:209 @@ -2078,7 +2047,7 @@ #: 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:72 +#: kallithea/templates/base/root.html:70 #: kallithea/templates/bookmarks/bookmarks.html:84 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:211 @@ -2090,8 +2059,7 @@ #: kallithea/templates/index_base.html:145 #: 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:148 -#: kallithea/templates/base/root.html:73 +#: 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 @@ -2101,7 +2069,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:32 -#: kallithea/templates/base/base.html:267 +#: kallithea/templates/base/base.html:270 msgid "Log In" msgstr "" @@ -2116,14 +2084,14 @@ #: kallithea/templates/admin/users/user_add.html:35 #: kallithea/templates/admin/users/user_edit_profile.html:33 #: kallithea/templates/admin/users/users.html:53 -#: kallithea/templates/base/base.html:243 +#: kallithea/templates/base/base.html:246 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:252 +#: kallithea/templates/base/base.html:255 msgid "Password" msgstr "密碼" @@ -2139,7 +2107,7 @@ msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:263 +#: kallithea/templates/login.html:75 kallithea/templates/base/base.html:266 msgid "Don't have an account ?" msgstr "沒有帳號?" @@ -2238,7 +2206,7 @@ #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:16 -#: kallithea/templates/base/base.html:69 +#: kallithea/templates/base/base.html:72 msgid "Admin journal" msgstr "管理員日誌" @@ -2299,7 +2267,7 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:14 -#: kallithea/templates/base/base.html:75 +#: kallithea/templates/base/base.html:78 msgid "Authentication" msgstr "" @@ -2322,12 +2290,12 @@ msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:65 +#: kallithea/templates/base/root.html:63 msgid "enabled" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:43 -#: kallithea/templates/base/root.html:66 +#: kallithea/templates/base/root.html:64 msgid "disabled" msgstr "" @@ -2361,7 +2329,7 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:14 -#: kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:79 msgid "Defaults" msgstr "" @@ -2536,7 +2504,6 @@ #: 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_license.html:43 #: kallithea/templates/admin/settings/settings_vcs.html:81 #: kallithea/templates/admin/settings/settings_visual.html:116 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 @@ -2611,7 +2578,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 -#: kallithea/templates/base/base.html:282 +#: kallithea/templates/base/base.html:285 msgid "My account" msgstr "我的帳號" @@ -2789,8 +2756,8 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:26 msgid "" -"Your user is in an external Source of Record; some details cannot be managed" -" here" +"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 @@ -2840,7 +2807,7 @@ #: 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:71 +#: kallithea/templates/base/root.html:69 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:82 #: kallithea/templates/journal/journal.html:210 @@ -2867,7 +2834,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:34 -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 msgid "Pull Requests" msgstr "" @@ -2885,7 +2852,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:12 -#: kallithea/templates/base/base.html:281 +#: kallithea/templates/base/base.html:284 msgid "Notifications" msgstr "" @@ -2898,7 +2865,7 @@ #: 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:74 +#: kallithea/templates/base/base.html:77 msgid "Permissions" msgstr "權限" @@ -2929,8 +2896,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 @@ -2976,8 +2943,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:72 msgid "" -"Write permission to repository groups allows creating repositories inside " -"that group" +"Write permission to repository groups allows creating repositories inside" +" that group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 @@ -3025,7 +2992,7 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:14 -#: kallithea/templates/base/base.html:71 kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:74 kallithea/templates/base/base.html:93 msgid "Repository groups" msgstr "" @@ -3071,8 +3038,7 @@ #: 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:77 -#: kallithea/templates/base/base.html:159 +#: kallithea/templates/base/base.html:80 kallithea/templates/base/base.html:162 msgid "Settings" msgstr "設定" @@ -3197,8 +3163,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 @@ -3246,8 +3212,7 @@ #: kallithea/templates/admin/repos/repo_add_base.html:36 #: kallithea/templates/admin/repos/repo_edit_settings.html:76 #: kallithea/templates/forks/fork.html:45 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +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 @@ -3283,8 +3248,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:30 #, python-format msgid "" -"Repository \"%(repo_name)s\" is beeing created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is beeing created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:42 @@ -3346,8 +3311,8 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:43 msgid "" -"All actions made on this repository will be accessible to everyone in public" -" journal" +"All actions made on this repository will be accessible to everyone in " +"public journal" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:49 @@ -3376,9 +3341,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:73 msgid "" -"Force locking on repository. Works only when anonymous access is disabled. " -"Trigering a pull locks repository by user who pulled, only the same user can" -" unlock by doing a push" +"Force locking on repository. Works only when anonymous access is " +"disabled. Trigering 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 @@ -3407,9 +3372,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:94 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for Kallithea and VCS systems. If you need to fully delete it from file " -"system please do it manually" +"This repository will be renamed in a special way in order to be " +"unaccesible for Kallithea and VCS systems. If you need to fully delete it" +" from file system please do it manually" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 @@ -3422,8 +3387,8 @@ #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 @@ -3516,9 +3481,12 @@ #: 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 allways be accessible under such url.\n" -" Usefull 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 above url guarantees that this " +"repository will allways be accessible under such url.\n" +" Usefull 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 @@ -3612,10 +3580,6 @@ msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings.html:48 -msgid "License" -msgstr "" - #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Email prefix" msgstr "" @@ -3698,12 +3662,11 @@ #: kallithea/templates/admin/settings/settings_global.html:50 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration" +"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_license.html:42 #: kallithea/templates/admin/settings/settings_vcs.html:80 #: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save settings" @@ -3715,8 +3678,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3727,57 +3690,6 @@ msgid "Failed to remove hook" msgstr "移除hook失敗" -#: kallithea/templates/admin/settings/settings_license.html:2 -msgid "Currently you're using a free license, which is limited to 20 users." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:9 -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "License token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:10 -msgid "No license token" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:13 -msgid "License issued to" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:14 -msgid "License issued on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "License users limit" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:15 -msgid "unlimited" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:16 -msgid "License expires on" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:33 -msgid "License key" -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:37 -msgid "Paste your Kallithea license key into that textarea." -msgstr "" - -#: kallithea/templates/admin/settings/settings_license.html:52 -msgid "" -"Please enter following lines (if yet not present) into [app:main] section of" -" your .ini file. The token below is autogenerated." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "" @@ -3788,8 +3700,9 @@ #: 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." +"In case a repository was deleted from filesystem and it still exists in " +"the database check this option to scan obsolete data in database and " +"remove it." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3798,8 +3711,8 @@ #: 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." +"Each cache data for repositories will be cleaned with this option " +"selected. Use this to reload data and clear cache keys." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:23 @@ -3808,8 +3721,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallitheas GIT hooks are installed for each repository. Current " -"hooks will be updated to latest version" +"Verify if Kallitheas GIT hooks are installed for each repository. Current" +" hooks will be updated to latest version" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 @@ -3835,6 +3748,10 @@ msgstr "重新索引" #: kallithea/templates/admin/settings/settings_system.html:4 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "check for updates" msgstr "" @@ -3924,14 +3841,14 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" -"Filesystem location where repositories should be stored. After changing this" -" value a restart and rescan of the repository folder are required." +"Filesystem location where repositories should be stored. After changing " +"this value a restart and rescan of the repository folder are required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:8 @@ -3961,22 +3878,34 @@ #: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar url allows you to use other avatar server application.\n" -" Following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" +" Following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" +"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'," +" available vars:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:54 @@ -3985,8 +3914,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:58 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:64 @@ -4034,7 +3963,7 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:13 -#: kallithea/templates/base/base.html:73 kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:76 kallithea/templates/base/base.html:96 msgid "User groups" msgstr "" @@ -4118,7 +4047,7 @@ #: kallithea/templates/admin/users/user_add.html:13 #: kallithea/templates/admin/users/user_edit.html:14 -#: kallithea/templates/base/base.html:72 +#: kallithea/templates/base/base.html:75 msgid "Users" msgstr "使用者" @@ -4188,8 +4117,8 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " -"managed here." +"This user is in an external Source of Record (%s); some details cannot be" +" managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 @@ -4229,50 +4158,50 @@ msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:46 +#: kallithea/templates/base/base.html:49 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:134 msgid "Create fork" msgstr "" -#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:145 #: kallithea/templates/data_table/_dt_elements.html:11 #: kallithea/templates/data_table/_dt_elements.html:15 #: kallithea/templates/summary/summary.html:11 msgid "Summary" msgstr "概況" -#: kallithea/templates/base/base.html:143 +#: kallithea/templates/base/base.html:146 #: kallithea/templates/changelog/changelog.html:17 #: kallithea/templates/data_table/_dt_elements.html:19 #: kallithea/templates/data_table/_dt_elements.html:23 msgid "Changelog" msgstr "修改紀錄" -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:147 #: kallithea/templates/data_table/_dt_elements.html:27 #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/templates/files/files.html:15 msgid "Files" msgstr "檔案" -#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:149 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:153 -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:158 msgid "Options" msgstr "選項" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:166 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "" -#: kallithea/templates/base/base.html:165 +#: 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 @@ -4282,112 +4211,112 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:167 -#: kallithea/templates/base/base.html:334 +#: 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:171 +#: kallithea/templates/base/base.html:174 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:176 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:181 +#: kallithea/templates/base/base.html:184 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:182 -msgid "Unfollow" -msgstr "" - #: kallithea/templates/base/base.html:185 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:188 #: kallithea/templates/data_table/_dt_elements.html:35 #: kallithea/templates/data_table/_dt_elements.html:39 #: kallithea/templates/forks/fork.html:12 msgid "Fork" msgstr "分支" -#: kallithea/templates/base/base.html:187 +#: kallithea/templates/base/base.html:190 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:196 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:230 +#: kallithea/templates/base/base.html:233 msgid "Not logged in" msgstr "" -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:240 msgid "Login to your account" msgstr "" -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:263 msgid "Forgot password ?" msgstr "忘記密碼?" -#: kallithea/templates/base/base.html:283 +#: kallithea/templates/base/base.html:286 msgid "Log Out" msgstr "登出" -#: kallithea/templates/base/base.html:308 +#: kallithea/templates/base/base.html:311 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:309 +#: kallithea/templates/base/base.html:312 #: kallithea/templates/journal/journal.html:4 msgid "Journal" msgstr "日誌" -#: kallithea/templates/base/base.html:314 -#: kallithea/templates/base/base.html:315 +#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:318 msgid "Public journal" msgstr "公開日誌" -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:323 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:321 -msgid "Gists" -msgstr "" - #: kallithea/templates/base/base.html:324 -msgid "Create new gist" -msgstr "" - -#: kallithea/templates/base/base.html:325 -msgid "All public gists" +msgid "Gists" msgstr "" #: kallithea/templates/base/base.html:327 -msgid "My public gists" +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:333 +#: kallithea/templates/base/base.html:336 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:394 +#: kallithea/templates/base/base.html:399 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:522 +#: kallithea/templates/base/base.html:527 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:531 +#: kallithea/templates/base/base.html:536 msgid "Site-wide shortcuts" msgstr "" @@ -4398,8 +4327,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit permissions from %s permissions settings, and default IP " -"address whitelist." +"Select to inherit permissions from %s permissions settings, and default " +"IP address whitelist." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4448,84 +4377,84 @@ msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:45 msgid "Add another comment" msgstr "" -#: kallithea/templates/base/root.html:48 +#: kallithea/templates/base/root.html:46 #: kallithea/templates/data_table/_dt_elements.html:216 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" -#: kallithea/templates/base/root.html:49 +#: kallithea/templates/base/root.html:47 msgid "Start following this repository" msgstr "開始追蹤這個版本庫" -#: kallithea/templates/base/root.html:50 +#: kallithea/templates/base/root.html:48 msgid "Group" msgstr "群組" -#: kallithea/templates/base/root.html:51 +#: kallithea/templates/base/root.html:49 msgid "members" msgstr "成員" -#: kallithea/templates/base/root.html:52 +#: kallithea/templates/base/root.html:50 #: kallithea/templates/pullrequests/pullrequest.html:202 msgid "Loading ..." msgstr "" +#: kallithea/templates/base/root.html:51 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:52 +msgid "Search truncated" +msgstr "" + #: kallithea/templates/base/root.html:53 -msgid "loading ..." +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:54 -msgid "Search truncated" +#: 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 "No matching files" +msgid "Open new pull request for selected changesets" msgstr "" #: kallithea/templates/base/root.html:56 -#: kallithea/templates/changelog/changelog.html:51 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Open new pull request" +msgid "Show selected changesets __S -> __E" msgstr "" #: kallithea/templates/base/root.html:57 -msgid "Open new pull request for selected changesets" +msgid "Show selected changeset __S" msgstr "" #: kallithea/templates/base/root.html:58 -msgid "Show selected changesets __S -> __E" +msgid "Selection link" msgstr "" #: kallithea/templates/base/root.html:59 -msgid "Show selected changeset __S" +#: kallithea/templates/changeset/diff_block.html:8 +msgid "Collapse diff" msgstr "" #: kallithea/templates/base/root.html:60 -msgid "Selection link" +msgid "Expand diff" msgstr "" #: kallithea/templates/base/root.html:61 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse diff" +msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:62 -msgid "Expand diff" -msgstr "" - -#: kallithea/templates/base/root.html:63 -msgid "Failed to revoke permission" -msgstr "" - -#: kallithea/templates/base/root.html:64 msgid "confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:68 +#: kallithea/templates/base/root.html:66 msgid "specify changeset" msgstr "" @@ -4829,8 +4758,7 @@ #: 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" +msgid "Use @username inside this text to send notification to this Kallithea user" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:73 @@ -5017,7 +4945,8 @@ #: 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." +"%s opened a pull request for repository %s and wants you to review " +"changes." msgstr "" #: kallithea/templates/email_templates/pull_request.html:8 @@ -5685,3 +5614,4 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "" +